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>
This commit is contained in:
parent
85bfe3c931
commit
7ea8496ce0
|
@ -76,9 +76,9 @@ export RANLIB_FOR_TARGET = "${TARGET_PREFIX}ranlib"
|
|||
export CC_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
|
||||
export CXX_FOR_HOST = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}"
|
||||
|
||||
# autotools.bbclass sets the _FOR_BUILD variables, but for some reason we need
|
||||
# to unset LD_LIBRARY_PATH.
|
||||
export CC_FOR_BUILD = "LD_LIBRARY_PATH= ${BUILD_CC}"
|
||||
export CPP_FOR_BUILD = "${BUILD_CPP}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
|
||||
|
||||
MULTIARCH := "${@bb.utils.contains("DISTRO_FEATURES", "multiarch", "yes", "no", d)}"
|
||||
do_configure[vardeps] += "MULTIARCH"
|
||||
|
|
|
@ -350,7 +350,6 @@ do_configure() {
|
|||
-e 's/pkg-config uuid/pkg-config ossp-uuid/g' -i configure
|
||||
|
||||
export varprefix=${localstatedir}
|
||||
export CC_FOR_BUILD="${BUILD_CC}"
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
|
|
|
@ -9,7 +9,6 @@ inherit autotools gettext update-alternatives
|
|||
PARALLEL_MAKE = ""
|
||||
|
||||
EXTRA_OECONF = "--enable-job-control"
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
|
||||
ALTERNATIVE_${PN} = "sh"
|
||||
ALTERNATIVE_LINK_NAME[sh] = "${base_bindir}/sh"
|
||||
|
|
|
@ -23,9 +23,8 @@ EXTRA_OECONF += "--disable-verbose \
|
|||
do_configure_prepend() {
|
||||
sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
|
||||
}
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export 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}"
|
||||
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
|
||||
CFLAGS_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}"
|
||||
LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
|
||||
|
||||
FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome"
|
||||
|
||||
|
|
|
@ -20,9 +20,8 @@ EXTRA_OECONF += "--disable-verbose \
|
|||
FILES_${PN} += "${datadir}/themes ${libdir}/mutter/plugins/*.so ${datadir}/gnome/wm-properties/"
|
||||
FILES_${PN}-dbg += "${libdir}/mutter/plugins/.debug/*"
|
||||
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include"
|
||||
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS} -L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
|
||||
CFLAGS_FOR_BUILD += "-I${STAGING_INCDIR_NATIVE}/glib-2.0 -I${STAGING_INCDIR_NATIVE}/glib-2.0/include"
|
||||
LDFLAGS_FOR_BUILD += "-L${STAGING_LIBDIR_NATIVE} -lglib-2.0"
|
||||
|
||||
do_configure_prepend () {
|
||||
echo "EXTRA_DIST=" > ${S}/gnome-doc-utils.make
|
||||
|
|
|
@ -30,12 +30,8 @@ EXTRA_OEMAKE += 'CWARNFLAGS=""'
|
|||
PACKAGECONFIG ??= ""
|
||||
PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
|
||||
|
||||
# src/util/makekeys needs to be compiled natively, so tell it what compiler to
|
||||
# use.
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS} -D_GNU_SOURCE"
|
||||
export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}"
|
||||
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
|
||||
# src/util/makekeys is built natively but needs -D_GNU_SOURCE defined.
|
||||
CPPFLAGS_FOR_BUILD += "-D_GNU_SOURCE"
|
||||
|
||||
PACKAGES =+ "${PN}-xcb"
|
||||
|
||||
|
|
|
@ -8,10 +8,6 @@ DEPENDS_class-nativesdk = "nativesdk-elfutils nativesdk-sqlite3 nativesdk-gettex
|
|||
|
||||
PR = "r0"
|
||||
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}"
|
||||
export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}"
|
||||
|
||||
EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
|
||||
--without-nss --without-avahi \
|
||||
--disable-server --disable-grapher "
|
||||
|
|
|
@ -16,6 +16,4 @@ SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
|
|||
SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"
|
||||
SRC_URI[sha256sum] = "d07ffcb37eecec35c5ec72516d10b35fdf6e6fef1fcf1dcd37e30b8cbf8bf941"
|
||||
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
|
||||
inherit autotools
|
||||
|
|
|
@ -8,7 +8,5 @@ SRC_URI_append = " file://use-includedir.patch \
|
|||
file://gmp_fix_for_automake-1.12.patch \
|
||||
"
|
||||
|
||||
export CC_FOR_BUILD = "${BUILD_CC}"
|
||||
|
||||
SRC_URI[md5sum] = "041487d25e9c230b0c42b106361055fe"
|
||||
SRC_URI[sha256sum] = "1f588aaccc41bb9aed946f9fe38521c26d8b290d003c5df807f65690f2aadec9"
|
||||
|
|
Loading…
Reference in New Issue