diff options
Diffstat (limited to 'recipes/xorg-lib/libx11_1.3.3.bb')
| -rw-r--r-- | recipes/xorg-lib/libx11_1.3.3.bb | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/recipes/xorg-lib/libx11_1.3.3.bb b/recipes/xorg-lib/libx11_1.3.3.bb index b4c2477ea4..89c57235fa 100644 --- a/recipes/xorg-lib/libx11_1.3.3.bb +++ b/recipes/xorg-lib/libx11_1.3.3.bb @@ -1,43 +1,7 @@ -require xorg-lib-common.inc - -DESCRIPTION = "Base X libs." -DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ - libxdmcp xf86bigfontproto kbproto inputproto xproto-native" -PROVIDES = "virtual/libx11" -PE = "1" +require libx11.inc PR = "r7" -XORG_PN = "libX11" - -SRC_URI += "file://x11_disable_makekeys.patch \ - file://dolt-fix.patch \ - ${@['file://keysymdef_include.patch', ''][(bb.data.inherits_class('native', d))]} \ -" - -# --with-keysymdef has intentionally no effect in native build without without keysymdef_include.patch -EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" - -# Below option is added to overcome the GCC bug on ARM -# see http://gcc.gnu.org/PR42981 for further details. -# We could potentially take it off when its fixed in gcc 4.5 - -CFLAGS_append_arm = " -fforward-propagate " - -do_compile() { - ( - unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - 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 ../../ - ) || 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" +SRC_URI += " file://dolt-fix.patch" SRC_URI[archive.md5sum] = "5d74971360f194ce33d2bd2e4d9b066c" SRC_URI[archive.sha256sum] = "8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac" |