diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-12-12 12:24:17 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-12-12 12:24:17 +0000 |
| commit | ada8de47c0371621a7906edcc624556f21e785ee (patch) | |
| tree | f2757a903c09ae7045d10b67951b14507bb0b5ca /packages | |
| parent | a004355ef9e8378dc8e6289c0aff189997c7c6db (diff) | |
| parent | ba78f0c9d4eeec88326869d3dd48aebe1cd32969 (diff) | |
merge of '19860068438a3f48413a2f40e4032ce5e8c1fe7d'
and 'a5b842809a85562e0154b206660598c3b851094c'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/fontconfig/fontconfig_2.4.1.bb | 18 | ||||
| -rw-r--r-- | packages/xorg-lib/libx11_X11R7.1-1.0.1.bb | 6 |
2 files changed, 21 insertions, 3 deletions
diff --git a/packages/fontconfig/fontconfig_2.4.1.bb b/packages/fontconfig/fontconfig_2.4.1.bb index 2590fed88e..098939324a 100644 --- a/packages/fontconfig/fontconfig_2.4.1.bb +++ b/packages/fontconfig/fontconfig_2.4.1.bb @@ -44,11 +44,29 @@ do_stage () { for i in ${S}/fontconfig/*.h; do install -m 0644 $i ${STAGING_INCDIR}/fontconfig/; done } +BUILD_CFLAGS += " -I${STAGING_DIR}/${BUILD_SYS}/include/freetype2" + do_configure_append () { sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-case/Makefile sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-glyphname/Makefile sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-lang/Makefile sed -i 's|LDFLAGS =.*|LDFLAGS =|' fc-arch/Makefile + + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-case/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-glyphname/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-lang/Makefile + sed -i 's|CFLAGS =.*|CFLAGS =${BUILD_CFLAGS}|' fc-arch/Makefile + + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-case/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-glyphname/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-lang/Makefile + sed -i 's|CPPFLAGS =.*|CPPFLAGS =${BUILD_CPPFLAGS}|' fc-arch/Makefile + + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-case/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-glyphname/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-lang/Makefile + sed -i 's|CXXFLAGS =.*|CFLAGS =${BUILD_CXXFLAGS}|' fc-arch/Makefile + } do_install () { diff --git a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb index b0eb8d2489..5b5abf4cea 100644 --- a/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb +++ b/packages/xorg-lib/libx11_X11R7.1-1.0.1.bb @@ -16,9 +16,9 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" do_compile() { ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'X11_CFLAGS=' 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util;${BUILD_CC} makekeys.c -o makekeys ) || exit 1 - rm -f ${STAGING_INCDIR}/X11/Xlib.h + rm -f ${STAGING_INCDIR}/X11/Xlib.h oe_runmake } |