From a7e49eb2af5d2ca6e53fb908fddfddd92696910a Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 10 Aug 2007 19:07:51 +0000
Subject: Merge in X11R7 patches from Julien Letessier, posted 04 Jul 2007. 
 Doesn't quite work yet for me, but this clearly is a huge project and not
 having it quite work on the first pass is hardly unexpected.  We definately
 want this stuff in buildroot.

---
 package/x11r7/xlib_libXt/Config.in                 | 12 +++++++
 .../xlib_libXt/xlib_libXt-1.0.4-makestrs.patch     | 38 ++++++++++++++++++++++
 package/x11r7/xlib_libXt/xlib_libXt.mk             | 16 +++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 package/x11r7/xlib_libXt/Config.in
 create mode 100644 package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
 create mode 100644 package/x11r7/xlib_libXt/xlib_libXt.mk

(limited to 'package/x11r7/xlib_libXt')

diff --git a/package/x11r7/xlib_libXt/Config.in b/package/x11r7/xlib_libXt/Config.in
new file mode 100644
index 000000000..2623f99d7
--- /dev/null
+++ b/package/x11r7/xlib_libXt/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_XLIB_LIBXT
+	bool "libXt"
+	default n
+	select BR2_PACKAGE_XLIB_LIBSM
+	select BR2_PACKAGE_XLIB_LIBX11
+	select BR2_PACKAGE_XPROTO_KBPROTO
+	select BR2_PACKAGE_XPROTO_XPROTO
+	select BR2_PACKAGE_XCB_PROTO
+	select BR2_PACKAGE_LIBXCB
+	help
+	  libXt 1.0.4
+	  X.Org Xt library
diff --git a/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch b/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
new file mode 100644
index 000000000..3669b83bb
--- /dev/null
+++ b/package/x11r7/xlib_libXt/xlib_libXt-1.0.4-makestrs.patch
@@ -0,0 +1,38 @@
+--- libXt-1.0.4/configure.ac.orig	2006-11-08 15:15:56.000000000 +0100
++++ libXt-1.0.4/configure.ac	2007-06-08 16:41:59.000000000 +0200
+@@ -37,6 +37,16 @@
+ AC_PROG_CC
+ AC_PROG_LIBTOOL
+ 
++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)
++
++
+ PKG_CHECK_MODULES(XT, sm x11 xproto kbproto)
+ 
+ # Needed for including Xalloca.h
+--- libXt-1.0.4/util/Makefile.am.orig	2006-10-27 21:10:56.000000000 +0200
++++ libXt-1.0.4/util/Makefile.am	2007-06-08 16:44:13.000000000 +0200
+@@ -4,6 +4,16 @@
+ noinst_PROGRAMS = makestrs
+ endif
+ 
++COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD)
++LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@
++
++$(srcdir)/makestrs-makestrs.o:
++	$(COMPILE) -c $< -o $@
++
++$(srcdir)/makestrs: $(srcdir)/makestrs-makestrs.o
++	$(LINK) $< -o $@
++
+ EXTRA_DIST = \
+ 	Shell.ht \
+ 	StrDefs.ct \
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
new file mode 100644
index 000000000..828e3810b
--- /dev/null
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -0,0 +1,16 @@
+################################################################################
+#
+# xlib_libXt -- X.Org Xt library
+#
+################################################################################
+
+XLIB_LIBXT_VERSION = 1.0.4
+XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2
+XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
+XLIB_LIBXT_AUTORECONF = YES
+XLIB_LIBXT_INSTALL_STAGING = YES
+XLIB_LIBXT_DEPENDANCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb
+XLIB_LIBXT_CONF_ENV = CC_FOR_BUILD="/usr/bin/gcc -I$(STAGING_DIR)/usr/include"
+XLIB_LIBXT_CONF_OPT = --disable-malloc0returnsnull --enable-shared --disable-static
+
+$(eval $(call AUTOTARGETS,xlib_libXt))
-- 
cgit v1.2.3