[oe-commits] org.oe.dev gcc: Some futher .bb -> .inc changes

[rpurdie commit]

gcc: Some futher .bb -> .inc changes

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 4bad5558e534f281c4bb3c867f13be98fc1b6fef
ViewMTN: http://monotone.openembedded.org/revision/info/4bad5558e534f281c4bb3c867f13be98fc1b6fef
Files:
1
classes/cpan.bbclass
classes/insane.bbclass
packages/gcc/gcc-cross_csl-arm-2005q3.bb
packages/gcc/gcc-cross_csl-arm-cvs.bb
packages/gcc/gcc-cross_csl-arm.bb
packages/gcc/gcc-csl-arm-cvs.inc
packages/gcc/gcc-native_3.4.4.bb
packages/glib-2.0/glib-2.0_2.15.6.bb
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/gtk-webcore/osb-browser_svn.bb
Diffs:

#
# mt diff -rb952ad8ac8a3924a5a39467e4b68fe4f0c4759d4 -r4bad5558e534f281c4bb3c867f13be98fc1b6fef
#
#
#
# patch "classes/cpan.bbclass"
#  from [3d10b2c778e3f89f5026df7ac1fcd54bc43fd360]
#    to [7a1ee7c60006de5f1fdeedf6a41459c55b0a894e]
# 
# patch "classes/insane.bbclass"
#  from [0712df99743c442ed311e6b4d4be0d28f29d525f]
#    to [8fbdc5bf22c0812dedcb14402f923bcf4159d81e]
# 
# patch "packages/gcc/gcc-cross_csl-arm-2005q3.bb"
#  from [cf1c1b76e78fa9d9b44d86914d69b86725561090]
#    to [b6d8fdf94563bcea639d079e911635357d79c3be]
# 
# patch "packages/gcc/gcc-cross_csl-arm-cvs.bb"
#  from [f4cef10fc748bb75954b41429d56a9a103075703]
#    to [a6716cd321b0cc6ff7b3e90985f92bcc625bda3c]
# 
# patch "packages/gcc/gcc-cross_csl-arm.bb"
#  from [8d4cc844ecafb7450db0a445be3261b3481dfc48]
#    to [1d570332d9460d3c00d80eed720278fb87618d79]
# 
# patch "packages/gcc/gcc-csl-arm-cvs.inc"
#  from [5c616f992fbd43d7d08e27e1ee87b070a8744385]
#    to [a58d90d313a84cb1b753e7e2b9e6d595f8fcd7a6]
# 
# patch "packages/gcc/gcc-native_3.4.4.bb"
#  from [20e9243b3b4c6a955128bf793a8a8a77a50d8d05]
#    to [011da31a571f048c1b55e09627e3589481407aca]
# 
# patch "packages/glib-2.0/glib-2.0_2.15.6.bb"
#  from [c13c859de167ff242477ffe86356620ae601725f]
#    to [0bfa6b7b4259a557f92ce561a63620ba08f02ae3]
# 
# patch "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  from [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
#    to [6d446a64d62ee79fc63d43aebc56508d08316dbb]
# 
# patch "packages/gtk-webcore/osb-browser_svn.bb"
#  from [a4aaa87e84fa4a445154cd52d8091f3f8bb46963]
#    to [a596b9f9099c52a956389aa76f1254c29e0465ba]
#
============================================================
--- classes/cpan.bbclass	3d10b2c778e3f89f5026df7ac1fcd54bc43fd360
+++ classes/cpan.bbclass	7a1ee7c60006de5f1fdeedf6a41459c55b0a894e
@@ -50,7 +50,16 @@ cpan_do_install () {
 }
 
 cpan_do_install () {
-	oe_runmake install_vendor
+	if [ ${@is_target(d)} == "yes" ]; then
+		oe_runmake install_vendor
+	fi
 }
 
+cpan_do_stage () {
+	if [ ${@is_target(d)} == "no" ]; then
+		oe_runmake install_vendor
+	fi
+}
+								
+
+EXPORT_FUNCTIONS do_configure do_compile do_install do_stage
-EXPORT_FUNCTIONS do_configure do_compile do_install
============================================================
--- classes/insane.bbclass	0712df99743c442ed311e6b4d4be0d28f29d525f
+++ classes/insane.bbclass	8fbdc5bf22c0812dedcb14402f923bcf4159d81e
@@ -341,7 +341,7 @@ def package_qa_check_staged(path,d):
         pkgconfigcheck = workdir
     else:
         installed = "installed=yes"
-        pkgconfigcheck = tmpdir
+        pkgconfigcheck = workdir
 
     # find all .la and .pc files
     # read the content
============================================================
--- packages/gcc/gcc-cross_csl-arm-2005q3.bb	cf1c1b76e78fa9d9b44d86914d69b86725561090
+++ packages/gcc/gcc-cross_csl-arm-2005q3.bb	b6d8fdf94563bcea639d079e911635357d79c3be
@@ -1,4 +1,4 @@
-require gcc_csl-arm-2005q3.bb
+require gcc-csl-arm-2005q3.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
============================================================
--- packages/gcc/gcc-cross_csl-arm-cvs.bb	f4cef10fc748bb75954b41429d56a9a103075703
+++ packages/gcc/gcc-cross_csl-arm-cvs.bb	a6716cd321b0cc6ff7b3e90985f92bcc625bda3c
@@ -1,4 +1,4 @@
-require gcc_csl-arm-cvs.bb
+require gcc-csl-arm-cvs.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
============================================================
--- packages/gcc/gcc-cross_csl-arm.bb	8d4cc844ecafb7450db0a445be3261b3481dfc48
+++ packages/gcc/gcc-cross_csl-arm.bb	1d570332d9460d3c00d80eed720278fb87618d79
@@ -1,4 +1,4 @@
-require gcc_csl-arm.bb
+require gcc-csl-arm.inc
 # path mangling, needed by the cross packaging
 require gcc-paths-cross.inc
 inherit cross
============================================================
--- packages/gcc/gcc-csl-arm-cvs.inc	5c616f992fbd43d7d08e27e1ee87b070a8744385
+++ packages/gcc/gcc-csl-arm-cvs.inc	a58d90d313a84cb1b753e7e2b9e6d595f8fcd7a6
@@ -1,4 +1,4 @@
-require gcc_csl-arm.bb
+require gcc-csl-arm.inc
 
 PV = "3.4.4+csl-arm-${SRCDATE}"
 BINV = "3.4.4"
============================================================
--- packages/gcc/gcc-native_3.4.4.bb	20e9243b3b4c6a955128bf793a8a8a77a50d8d05
+++ packages/gcc/gcc-native_3.4.4.bb	011da31a571f048c1b55e09627e3589481407aca
@@ -1,3 +1,3 @@
-require gcc_${PV}.bb
+require gcc-${PV}.inc
 require gcc-native.inc
 PROVIDES += "gcc3-native"
============================================================
--- packages/glib-2.0/glib-2.0_2.15.6.bb	c13c859de167ff242477ffe86356620ae601725f
+++ packages/glib-2.0/glib-2.0_2.15.6.bb	0bfa6b7b4259a557f92ce561a63620ba08f02ae3
@@ -1,5 +1,7 @@ require glib.inc
 require glib.inc
 
+DEFAULT_PREFERENCE = "-1"
+
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.15/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1 \
============================================================
--- packages/gpsdrive/gpsdrive_2.10pre4.bb	9e4cea32b63aa093d54c9b1039cfa8dd87790322
+++ packages/gpsdrive/gpsdrive_2.10pre4.bb	6d446a64d62ee79fc63d43aebc56508d08316dbb
@@ -31,3 +31,4 @@ FILES_${PN}-doc = "${datadir}/man ${data
 FILES_${PN}-map-icons-other = "${datadir}/map-icons/classic.big ${datadir}/map-icons/japan ${datadir}/map-icons/nickw ${datadir}/map-icons/square.big ${datadir}/map-icons/square.small ${datadir}/map-icons/svg"
 FILES_${PN}-maps = "${datadir}/${PN}/maps ${datadir}/${PN}/map_koord.txt"
 FILES_${PN}-doc = "${datadir}/man ${datadir}/${PN}/Documentation"
+
============================================================
--- packages/gtk-webcore/osb-browser_svn.bb	a4aaa87e84fa4a445154cd52d8091f3f8bb46963
+++ packages/gtk-webcore/osb-browser_svn.bb	a596b9f9099c52a956389aa76f1254c29e0465ba
@@ -14,5 +14,5 @@ S = "${WORKDIR}/osb-browser"
 
 S = "${WORKDIR}/osb-browser"
 
-DEFAULT_PREFERENCE = "-1"
+DEFAULT_PREFERENCE = "5"