diff options
Diffstat (limited to 'recipes/xorg-lib/libx11_1.1.4.bb')
| -rw-r--r-- | recipes/xorg-lib/libx11_1.1.4.bb | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/recipes/xorg-lib/libx11_1.1.4.bb b/recipes/xorg-lib/libx11_1.1.4.bb index 6949a3f2fa..fb45668d59 100644 --- a/recipes/xorg-lib/libx11_1.1.4.bb +++ b/recipes/xorg-lib/libx11_1.1.4.bb @@ -1,35 +1,8 @@ -require xorg-lib-common.inc +require libx11.inc +PR = "r7" -DESCRIPTION = "Base X libs." -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" -PROVIDES = "virtual/libx11" -PE = "1" -PR = "r3" - -XORG_PN = "libX11" - -SRC_URI += "file://x11_disable_makekeys.patch \ - file://include_fix.patch" - -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; - mv makekeys.c.orig makekeys.c || true - sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c - 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 ../../ - ) || exit 1 - oe_runmake -} - -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" +DEPENDS = "${COMMON_DEPENDS}" +EXTRA_OECONF += " --without-xcb" SRC_URI[archive.md5sum] = "1469a5a8aa8d288dce6f4c45d2f68dc3" SRC_URI[archive.sha256sum] = "bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c" |