diff options
| -rw-r--r-- | meta/packages/xorg-lib/libx11.inc | 6 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11_git.bb | 13 |
2 files changed, 4 insertions, 15 deletions
diff --git a/meta/packages/xorg-lib/libx11.inc b/meta/packages/xorg-lib/libx11.inc index 8245cd1d08..b1f573ef79 100644 --- a/meta/packages/xorg-lib/libx11.inc +++ b/meta/packages/xorg-lib/libx11.inc @@ -8,6 +8,9 @@ LEAD_SONAME = "libX11.so" EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + do_compile() { cd ${S}/src/util mv makekeys.c.orig makekeys.c || true @@ -25,5 +28,4 @@ do_compile() { oe_runmake } -FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" -FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" + diff --git a/meta/packages/xorg-lib/libx11_git.bb b/meta/packages/xorg-lib/libx11_git.bb index 1eff168f64..f1aeb00ac5 100644 --- a/meta/packages/xorg-lib/libx11_git.bb +++ b/meta/packages/xorg-lib/libx11_git.bb @@ -9,16 +9,3 @@ PV = "1.1.99.1+gitr${SRCREV}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libX11;protocol=git" S = "${WORKDIR}/git" -EXTRA_OECONF += "--enable-malloc0returnsnull" - -do_compile() { - ( - unset CC LD CXX CCLD - oe_runmake -C src/util 'CC=${BUILD_CC}' 'LD=${BUILD_LD}' 'CXX=${BUILD_CXX}' 'CCLD=${BUILD_CCLD}' 'CFLAGS=-D_GNU_SOURCE ${BUILD_CFLAGS}' 'LDFLAGS=${BUILD_LDFLAGS}' 'CXXFLAGS=${BUILD_CXXFLAGS}' 'CPPFLAGS=${BUILD_CPPFLAGS}' makekeys - ) - oe_runmake -} - -do_stage() { - autotools_stage_all -} |