diff options
| author | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2008-03-07 13:05:07 +0000 |
| commit | 0b098d35b319ed6c00f363cb0d4fd447d7fb8d57 (patch) | |
| tree | a830bf983a66688f5648cd83e362c4fea2f48f6b /packages/xorg-lib/libx11_1.1.2.bb | |
| parent | 06fb90eb31b0b85a5c5c7adf185ce2515c5b1220 (diff) | |
| parent | d3bbd28f22fbd8e9d097081fa128ae18197f36e1 (diff) | |
merge of '26501141207c84e31e0f43c5795a15c0f16dbce5'
and '86618f966282489d43b51fbf0ee93b954ac615ae'
Diffstat (limited to 'packages/xorg-lib/libx11_1.1.2.bb')
| -rw-r--r-- | packages/xorg-lib/libx11_1.1.2.bb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/packages/xorg-lib/libx11_1.1.2.bb b/packages/xorg-lib/libx11_1.1.2.bb index e6b0ec5d8b..5243de4259 100644 --- a/packages/xorg-lib/libx11_1.1.2.bb +++ b/packages/xorg-lib/libx11_1.1.2.bb @@ -5,19 +5,21 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" -PR = "r1" +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 + cd ../../ + ) || exit 1 + oe_runmake } FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" |