diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-08-22 13:12:45 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-22 13:12:45 +0000 |
| commit | e7581b58f4f3dc1b1f3994c7d4dc3d46779a1bb7 (patch) | |
| tree | a32ab7b337d3b3326a35a2d64a4ccdbd082949b1 /meta | |
| parent | c09b63e6edf1ca4b1b64257c15f6b2f002fa8d8d (diff) | |
| download | openembedded-core-e7581b58f4f3dc1b1f3994c7d4dc3d46779a1bb7.tar.gz openembedded-core-e7581b58f4f3dc1b1f3994c7d4dc3d46779a1bb7.tar.bz2 openembedded-core-e7581b58f4f3dc1b1f3994c7d4dc3d46779a1bb7.zip | |
libx11: Disable makekeys properly allowing the package to rebuild without weird failures
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2537 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/packages/xorg-lib/files/x11_disable_makekeys.patch | 30 | ||||
| -rw-r--r-- | meta/packages/xorg-lib/libx11_1.1.2.bb | 17 |
2 files changed, 42 insertions, 5 deletions
diff --git a/meta/packages/xorg-lib/files/x11_disable_makekeys.patch b/meta/packages/xorg-lib/files/x11_disable_makekeys.patch new file mode 100644 index 0000000000..2a8a55cdf5 --- /dev/null +++ b/meta/packages/xorg-lib/files/x11_disable_makekeys.patch @@ -0,0 +1,30 @@ +--- + src/util/Makefile.am | 17 ----------------- + 1 file changed, 17 deletions(-) + +Index: libX11-1.1.2/src/util/Makefile.am +=================================================================== +--- libX11-1.1.2.orig/src/util/Makefile.am 2007-08-22 14:17:42.000000000 +0100 ++++ libX11-1.1.2/src/util/Makefile.am 2007-08-22 14:18:04.000000000 +0100 +@@ -1,21 +1,4 @@ + # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $ + +-noinst_PROGRAMS=makekeys +- +-makekeys_CFLAGS=$(X11_CFLAGS) +- +-#override CC = gcc +-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +- + EXTRA_DIST = mkks.sh + +-if LINT +-# Check source code with tools like lint & sparse +- +-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ +- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) +- +-lint: +- $(LINT) $(ALL_LINT_FLAGS) makekeys.c +- +-endif LINT diff --git a/meta/packages/xorg-lib/libx11_1.1.2.bb b/meta/packages/xorg-lib/libx11_1.1.2.bb index bab2277fd0..93ad71f466 100644 --- a/meta/packages/xorg-lib/libx11_1.1.2.bb +++ b/meta/packages/xorg-lib/libx11_1.1.2.bb @@ -5,17 +5,24 @@ DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ libxdmcp xf86bigfontproto kbproto inputproto" PROVIDES = "virtual/libx11" PE = "1" +PR = "r2" XORG_PN = "libX11" +SRC_URI += "file://x11_disable_makekeys.patch;patch=1" + + EXTRA_OECONF += "--without-xcb" 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 + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} 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" |