diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-09-25 12:38:05 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-09-25 12:38:05 +0000 |
| commit | 8e4e856e3ce058841adf6692c83efca0c2fc85c2 (patch) | |
| tree | daf5c742f60756a62196e48cf1474fe22400487a /packages/xorg-lib/libx11_1.1.4.bb | |
| parent | ebefc8130b47867e376a6c6cf4291ffe52f35b7d (diff) | |
xorg-lib: attempt to merge with poky
* fixed DEPENDS from poky
* -sdk package from poky
Diffstat (limited to 'packages/xorg-lib/libx11_1.1.4.bb')
| -rw-r--r-- | packages/xorg-lib/libx11_1.1.4.bb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/xorg-lib/libx11_1.1.4.bb b/packages/xorg-lib/libx11_1.1.4.bb index 88771558f8..7ab3a7bb94 100644 --- a/packages/xorg-lib/libx11_1.1.4.bb +++ b/packages/xorg-lib/libx11_1.1.4.bb @@ -2,7 +2,7 @@ require xorg-lib-common.inc DESCRIPTION = "Base X libs." DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto" + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" PROVIDES = "virtual/libx11" PE = "1" PR = "r3" @@ -17,7 +17,9 @@ EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef. do_compile() { ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig cd ../../ |