diff options
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/mutter/mutter.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 8 |
2 files changed, 4 insertions, 9 deletions
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 \ 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 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=""' 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" |