sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

libx11_git: Cleanup duplicate metadata 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5523 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2008-10-17 09:19:37 +00:00
parent f4b04c9b26
commit da303793d0
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/packages/xorg-lib/libx11.inc
View File

@ -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"

13
meta/packages/xorg-lib/libx11_git.bb
View File

@ -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
}