x11-libs/libXt: fix cross-compile yet again, should fix bug #290307

Package-Manager: portage-2.2_rc48/cvs/Linux i686

4 files changed, 140 insertions, 2 deletions

diff --git a/x11-libs/libXt/ChangeLog b/x11-libs/libXt/ChangeLog
index d74772e40636..15f91fe8a365 100644
--- a/x11-libs/libXt/ChangeLog
+++ b/x11-libs/libXt/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libXt
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/ChangeLog,v 1.60 2009/10/26 21:02:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/ChangeLog,v 1.61 2009/11/05 11:41:08 remi Exp $
+
+*libXt-1.0.7-r1 (05 Nov 2009)
+
+  05 Nov 2009; Rémi Cardona <remi@gentoo.org> +libXt-1.0.7-r1.ebuild,
+  +files/libXt-1.0.7-fix-cross-compile-again.patch:
+  fix cross-compile yet again, should fix bug #290307
 
   26 Oct 2009; Jeroen Roovers <jer@gentoo.org> libXt-1.0.6.ebuild:
   Stable for HPPA (bug #282290).
diff --git a/x11-libs/libXt/Manifest b/x11-libs/libXt/Manifest
index e0f8006a507b..3bd5803d6594 100644
--- a/x11-libs/libXt/Manifest
+++ b/x11-libs/libXt/Manifest
@@ -1,10 +1,12 @@
 AUX libXt-1.0.5-cross.patch 699 RMD160 95312a3887ddbf62cf509ab2df5ed78e455fd5d1 SHA1 3d76ef06df5308408978966fdd77081b66aeb05d SHA256 17dfc37250e69011ecd34acc6924da389bdcd7d76d588a6fe35c460e67a0616e
 AUX libXt-1.0.6-cross.patch 1505 RMD160 d1ffcf2ce9f6291120c99d2535bcea35ebffa145 SHA1 276f1ecd374a4aa061c597cea3674dd2a85d77b3 SHA256 98cf3307fcfc3ea3aad643830c0b1e4e155aa80469edbb1a8261f5a1b381febf
+AUX libXt-1.0.7-fix-cross-compile-again.patch 2819 RMD160 d7e8d7a3ca5eee368c57cc885b3fd9d6b94f8bd2 SHA1 d7771e640c7ba1863d5e33adf3b7f67c998961ac SHA256 a80a062538cb0a4147cd8ceb5466e8fc34dd57fddb5e4bd5cf79f0f0785e2f27
 DIST libXt-1.0.5.tar.bz2 500502 RMD160 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf SHA1 5f33921e373ce162a39eabef2ce05d946935eb5b SHA256 43c472ada59a04428a463225cd4cd42cb81bc43eb687cc1890f2f1c81a3e9cf4
 DIST libXt-1.0.6.tar.bz2 538143 RMD160 3ad412ee271513e2ca4d8d8f7945d1d1ec0efeae SHA1 8396f51c413006a14c1d7ecd3270a3c59736654a SHA256 8d940251972ffe7e3caa41c4e82b6659ad4070aa2ec0d3e789c9fa39b79ff947
 DIST libXt-1.0.7.tar.bz2 559875 RMD160 eb6553819486cef75d2cbb76e12953c6da5fb997 SHA1 3c285b9c04a393dec1cc3d60cf5582d798eb3272 SHA256 706d5248b061c8455f74ce5269ecc5ef59c27d0f52d22b07138f781928dda9ec
 EBUILD libXt-1.0.5.ebuild 770 RMD160 55750122b2803b2aced4f39ca1005c59dd65058c SHA1 b7989dc31ca85ef7e6e2d1190a09f13645bdf713 SHA256 032ede6e736d2f1e549ac0d24b81ca626472ad7b2c0f51f9b48a8208fd0ebb57
 EBUILD libXt-1.0.6.ebuild 913 RMD160 11a7b8d3b983c717a938e717a10ff78592896de0 SHA1 30d1dc2a4b0d3cbd2991a4c0d23fe5418d836f57 SHA256 60d6de34d3ce7b674af80ed7e27a318bc3d508d2fea6970ee060f1996a2501b6
+EBUILD libXt-1.0.7-r1.ebuild 835 RMD160 0d8146e005bd44886d13d5b4173fd7c2617cea28 SHA1 2181a517beed42b8c77deda8cf7a38710e2e7c62 SHA256 31647804ebe7ba8865fce0cd12e1ca7814610405f6803facf829d82020245d0c
 EBUILD libXt-1.0.7.ebuild 665 RMD160 bdb93b991475a8f4b020382a945932b112c779bb SHA1 5a3822b0a2243c046004ad0a5b6996522eb7a483 SHA256 c9743ff85c49e0838cbbd2d84a9e4ed36c2696940af5132e59742b9794d0ea5c
-MISC ChangeLog 7318 RMD160 23609b0cde3b287b1286d780311563738c3c168d SHA1 200ad5d5b7f123cc5f7946ca00de75f46f94e697 SHA256 7558eac4e660371c9d39f45de24d78f7e3a94d5c2a8ea944388c4e1affaf5348
+MISC ChangeLog 7528 RMD160 278bc9ab43b8b4b646f8fdbccd7bdd90fa42a757 SHA1 e1285367246e04ace0cc0edaf2d36d3be8506e2c SHA256 6729b410c55209f928f127fb62ddf5468ff080a2193a7ec5677115fb5c52692e
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-libs/libXt/files/libXt-1.0.7-fix-cross-compile-again.patch b/x11-libs/libXt/files/libXt-1.0.7-fix-cross-compile-again.patch
new file mode 100644
index 000000000000..fc5ea7d75789
--- /dev/null
+++ b/x11-libs/libXt/files/libXt-1.0.7-fix-cross-compile-again.patch
@@ -0,0 +1,96 @@
+From da5ba611fbff6f939a7cec9ca41fa7df0f76a197 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Thu, 5 Nov 2009 11:55:22 +0100
+Subject: [PATCH] fix cross-compile again
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+makestrs should always be built for the target arch. When cross-compiling,
+create a native version "xmakestrs" which will always be noinst, and use it
+to generate the other sources.
+
+This avoids installing a makestrs built for the wrong arch.
+
+Based on this patch :
+http://overlays.gentoo.org/proj/embedded/browser/openmoko/trunk/openmoko-target/x11-libs/libXt/files/libXt-1.0.7-crosscompile-makestr.patch
+
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+---
+ configure.ac     |    2 ++
+ src/Makefile.am  |    8 +++++++-
+ util/Makefile.am |   15 ++++++++++-----
+ 3 files changed, 19 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6a66d45..73bfbc0 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,8 @@ AC_PROG_LIBTOOL
+ AM_PROG_CC_C_O
+ XORG_DEFAULT_OPTIONS
+ 
++AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
++
+ if test x"$CC_FOR_BUILD" = x; then
+ 	if test x"$cross_compiling" = xyes; then
+ 		AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a43fb22..6b767a7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -92,12 +92,18 @@ BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
+ 
+ STRING_LIST = $(top_srcdir)/util/string.list
+ 
++if CROSS_COMPILING
++MAKESTRS=$(top_builddir)/util/xmakestrs
++else
++MAKESTRS=$(top_builddir)/util/makestrs
++endif
++
+ all-local: $(BUILT_FILES)
+ 
+ $(BUILT_HEADER): $(BUILT_SOURCE)
+ 
+ $(BUILT_SOURCE):
+-	$(top_builddir)/util/makestrs -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
++	$(MAKESTRS) -i $(top_srcdir) $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c
+ 	mkdir -p $(top_builddir)/src
+ 	mkdir -p $(top_builddir)/include/X11
+ 	cp StringDefs.h $(top_builddir)/include/X11
+diff --git a/util/Makefile.am b/util/Makefile.am
+index d51365e..6853d89 100644
+--- a/util/Makefile.am
++++ b/util/Makefile.am
+@@ -1,13 +1,10 @@
+ if INSTALL_MAKESTRS
+ bin_PROGRAMS = makestrs
++noinst_PROGRAMS = $(MAKESTRS_PROG)
+ else
+-noinst_PROGRAMS = makestrs
++noinst_PROGRAMS = makestrs $(MAKESTRS_PROG)
+ endif
+ 
+-CC = @CC_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = \
+ 	Shell.ht \
+ 	StrDefs.ct \
+@@ -45,3 +42,11 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man
+ 
+ .man.$(APP_MAN_SUFFIX):
+ 	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
++
++if CROSS_COMPILING
++MAKESTRS_PROG=xmakestrs$(EXEEXT)
++
++xmakestrs$(EXEEXT): makestrs.c
++	$(AM_V_GEN)$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
++	$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
++endif
+-- 
+1.6.5.2
+
diff --git a/x11-libs/libXt/libXt-1.0.7-r1.ebuild b/x11-libs/libXt/libXt-1.0.7-r1.ebuild
new file mode 100644
index 000000000000..30200a5b1f9d
--- /dev/null
+++ b/x11-libs/libXt/libXt-1.0.7-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.7-r1.ebuild,v 1.1 2009/11/05 11:41:08 remi Exp $
+
+SNAPSHOT="yes"
+
+inherit x-modular flag-o-matic toolchain-funcs
+
+DESCRIPTION="X.Org Xt library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libSM
+	x11-proto/xproto
+	x11-proto/kbproto"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-cross-compile-again.patch" )
+
+pkg_setup() {
+	# No such function yet
+	# x-modular_pkg_setup
+
+	# (#125465) Broken with Bdirect support
+	filter-flags -Wl,-Bdirect
+	filter-ldflags -Bdirect
+	filter-ldflags -Wl,-Bdirect
+
+	if tc-is-cross-compiler; then
+		CFLAGS_FOR_BUILD="${BUILD_CFLAGS}"
+	fi
+}