aboutsummaryrefslogtreecommitdiff
path: root/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch')
-rw-r--r--package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch46
1 files changed, 46 insertions, 0 deletions
diff --git a/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch b/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
new file mode 100644
index 0000000000..b08cafae65
--- /dev/null
+++ b/package/x11r7/xlib_libX11/xlib_libX11-1.1.1-makekeys.patch
@@ -0,0 +1,46 @@
+--- libX11-1.1.1/configure.ac.orig 2006-12-01 02:50:11.000000000 +0100
++++ libX11-1.1.1/configure.ac 2007-06-08 15:20:02.000000000 +0200
+@@ -7,6 +7,8 @@
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ libX11)
+ AC_CONFIG_SRCDIR([Makefile.am])
++AC_CANONICAL_BUILD
++AC_CANONICAL_HOST
+ AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+
+ AM_MAINTAINER_MODE
+@@ -18,6 +20,15 @@
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
+
++AC_MSG_CHECKING([for CC_FOR_BUILD])
++if test x$host != x$build ; then
++ CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
++else
++ CC_FOR_BUILD=${CC}
++fi
++AC_MSG_RESULT([$CC_FOR_BUILD])
++AC_SUBST(CC_FOR_BUILD)
++
+ XORG_PROG_RAWCPP
+
+ # Build with XCB support?
+--- libX11-1.1.1/src/util/Makefile.am.orig 2006-10-04 19:43:17.000000000 +0200
++++ libX11-1.1.1/src/util/Makefile.am 2007-06-08 15:20:42.000000000 +0200
+@@ -5,7 +5,15 @@
+ makekeys_CFLAGS=$(X11_CFLAGS)
+
+ #override CC = gcc
+-LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++$(srcdir)/makekeys-makekeys.o:
++ $(COMPILE) -c $< -o $@
++
++$(srcdir)/makekeys: $(srcdir)/makekeys-makekeys.o
++ $(LINK) $< -o $@
+
+ EXTRA_DIST = mkks.sh
+