diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-03-05 22:15:39 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-03-05 22:15:39 +0000 |
| commit | c26884da6913045c85e2343d87ca73f418f39c3a (patch) | |
| tree | e043fe20350da120049a9980409d800fc123df3b /packages/xorg-lib/libx11_1.1.3.bb | |
| parent | 37ab1cb1d854d5d4b1c47c5b1af15527cb859fce (diff) | |
libx11: Fix location of keysymdef.h
Diffstat (limited to 'packages/xorg-lib/libx11_1.1.3.bb')
| -rw-r--r-- | packages/xorg-lib/libx11_1.1.3.bb | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/packages/xorg-lib/libx11_1.1.3.bb b/packages/xorg-lib/libx11_1.1.3.bb index 4035c77cdc..58f5b82419 100644 --- a/packages/xorg-lib/libx11_1.1.3.bb +++ b/packages/xorg-lib/libx11_1.1.3.bb @@ -5,19 +5,23 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" -PR = "r0" +PR = "r3" XORG_PN = "libX11" -EXTRA_OECONF += "--without-xcb" +SRC_URI += "file://include_fix.patch;patch=1" + +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" 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 ../../ - ) || exit 1 - oe_runmake + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} makekeys.c -o makekeys + # mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake } FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" |