summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-11-09 10:09:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-12 13:36:37 +0000
commit7ea8496ce085d507166efbd3a5e4d20444d3c35f (patch)
tree3ab892adc8d6e01a280f475413e72c8874b63b80
parent85bfe3c931d7ef5ee461251abb6772564733e072 (diff)
downloadpoky-7ea8496ce085d507166efbd3a5e4d20444d3c35f.tar.gz
meta: remove redundant _FOR_BUILD variables
(From OE-Core rev: acabd2158d9004dedfdfad8c170b77d32684f3fc) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc4
-rw-r--r--meta/recipes-devtools/rpm/rpm_5.4.9.bb1
-rw-r--r--meta/recipes-extended/bash/bash.inc1
-rw-r--r--meta/recipes-gnome/gnome/metacity_2.30.3.bb5
-rw-r--r--meta/recipes-graphics/mutter/mutter.inc5
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc8
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb4
-rw-r--r--meta/recipes-support/gmp/gmp_4.2.1.bb2
-rw-r--r--meta/recipes-support/gmp/gmp_5.0.5.bb2
9 files changed, 8 insertions, 24 deletions
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index ff64882d14..1e592962ee 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -76,9 +76,9 @@ export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
76export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" 76export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
77export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" 77export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
78 78
79# autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need
80# to unset LD_LIBRARY_PATH.
79export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}" 81export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
80export CPP_FOR_BUILD = "${BUILD_CPP}"
81export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
82 82
83MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}" 83MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}"
84do_configure[vardeps] += "MULTIARCH" 84do_configure[vardeps] += "MULTIARCH"
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.9.bb b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
index 3268160d86..072128403a 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.9.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.9.bb
@@ -350,7 +350,6 @@ do_configure() {
350 -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure 350 -e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure
351 351
352 export varprefix=${localstatedir} 352 export varprefix=${localstatedir}
353 export CC_FOR_BUILD="${BUILD_CC}"
354 oe_runconf 353 oe_runconf
355} 354}
356 355
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index ae4b681000..f1de931e82 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,7 +9,6 @@ inherit autotools gettext update-alternatives
9PARALLEL_MAKE = "" 9PARALLEL_MAKE = ""
10 10
11EXTRA_OECONF = "--enable-job-control" 11EXTRA_OECONF = "--enable-job-control"
12export CC_FOR_BUILD = "${BUILD_CC}"
13 12
14ALTERNATIVE_${PN} = "sh" 13ALTERNATIVE_${PN} = "sh"
15ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh" 14ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
diff --git a/meta/recipes-gnome/gnome/metacity_2.30.3.bb b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
index 3524f0e8d7..5b996d2297 100644
--- a/meta/recipes-gnome/gnome/metacity_2.30.3.bb
+++ b/meta/recipes-gnome/gnome/metacity_2.30.3.bb
@@ -23,9 +23,8 @@ EXTRA_OECONF += "--disable-verbose \
23do_configure_prepend() { 23do_configure_prepend() {
24 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in 24 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
25} 25}
26export CC_FOR_BUILD = "${BUILD_CC}" 26CFLAGS_FOR_BUILD += "-I${STAGING_LIBDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}"
27export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_LIBDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include -I${STAGING_INCDIR_NATIVE}" 27LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
28export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
29 28
30FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" 29FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
31 30
diff --git a/meta/recipes-graphics/mutter/mutter.inc b/meta/recipes-graphics/mutter/mutter.inc
index da78827ac0..942349f95b 100644
--- a/meta/recipes-graphics/mutter/mutter.inc
+++ b/meta/recipes-graphics/mutter/mutter.inc
@@ -20,9 +20,8 @@ EXTRA_OECONF += "--disable-verbose \
20FILES_${PN} += "${datadir}/themes ${libdir}/mutter/plugins/*.so ${datadir}/gnome/wm-properties/" 20FILES_${PN} += "${datadir}/themes ${libdir}/mutter/plugins/*.so ${datadir}/gnome/wm-properties/"
21FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*" 21FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
22 22
23export CC_FOR_BUILD = "${BUILD_CC}" 23CFLAGS_FOR_BUILD += "-I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include"
24export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include" 24LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
25export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
26 25
27do_configure_prepend () { 26do_configure_prepend () {
28 echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make 27 echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 71e74f77dc..e0fce3eba2 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -30,12 +30,8 @@ EXTRA_OEMAKE += 'CWARNFLAGS=""'
30PACKAGECONFIG ??= "" 30PACKAGECONFIG ??= ""
31PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" 31PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
32 32
33# src/util/makekeys needs to be compiled natively, so tell it what compiler to 33# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined.
34# use. 34CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
35export CC_FOR_BUILD = "${BUILD_CC}"
36export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -D_GNU_SOURCE"
37export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
38export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
39 35
40PACKAGES =+ "${PN}-xcb" 36PACKAGES =+ "${PN}-xcb"
41 37
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb
index 9e88ee979d..a490a2ea56 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.bb
+++ b/meta/recipes-kernel/systemtap/systemtap_git.bb
@@ -8,10 +8,6 @@ DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettex
8 8
9PR = "r0" 9PR = "r0"
10 10
11export CC_FOR_BUILD = "${BUILD_CC}"
12export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
13export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
14
15EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ 11EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
16 --without-nss --without-avahi \ 12 --without-nss --without-avahi \
17 --disable-server --disable-grapher " 13 --disable-server --disable-grapher "
diff --git a/meta/recipes-support/gmp/gmp_4.2.1.bb b/meta/recipes-support/gmp/gmp_4.2.1.bb
index 1f86a65e2a..49ee59b7dc 100644
--- a/meta/recipes-support/gmp/gmp_4.2.1.bb
+++ b/meta/recipes-support/gmp/gmp_4.2.1.bb
@@ -16,6 +16,4 @@ SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
16SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3" 16SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
17SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941" 17SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"
18 18
19export CC_FOR_BUILD = "${BUILD_CC}"
20
21inherit autotools 19inherit autotools
diff --git a/meta/recipes-support/gmp/gmp_5.0.5.bb b/meta/recipes-support/gmp/gmp_5.0.5.bb
index 20588684be..d91340ce92 100644
--- a/meta/recipes-support/gmp/gmp_5.0.5.bb
+++ b/meta/recipes-support/gmp/gmp_5.0.5.bb
@@ -8,7 +8,5 @@ SRC_URI_append = " file://use-includedir.patch \
8 file://gmp_fix_for_automake-1.12.patch \ 8 file://gmp_fix_for_automake-1.12.patch \
9 " 9 "
10 10
11export CC_FOR_BUILD = "${BUILD_CC}"
12
13SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe" 11SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe"
14SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9" 12SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9"