Added patch to compile with -fPIC the library, and unset $SYMLINK_LIB which is set by AMD64-multilib profile and conflicts with internal build one.

Package-Manager: portage-2.0.51.22-r1

4 files changed, 54 insertions, 4 deletions

diff --git a/app-arch/xar/ChangeLog b/app-arch/xar/ChangeLog
index 221b5de87edb..83329fe5b36e 100644
--- a/app-arch/xar/ChangeLog
+++ b/app-arch/xar/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/xar
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/ChangeLog,v 1.1 2005/04/24 04:57:07 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/ChangeLog,v 1.2 2005/06/28 18:24:48 flameeyes Exp $
+
+  28 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/xar-20050423-amd64.patch, xar-20050423.ebuild:
+  Added patch to compile with -fPIC the library, and unset $SYMLINK_LIB which
+  is set by AMD64-multilib profile and conflicts with internal build one.
 
 *xar-20050423 (23 Apr 2005)
 
diff --git a/app-arch/xar/Manifest b/app-arch/xar/Manifest
index 09885c018ef8..ea8d90fd7878 100644
--- a/app-arch/xar/Manifest
+++ b/app-arch/xar/Manifest
@@ -1,4 +1,15 @@
-MD5 153b9d7d8858d0390f9a35e774ac2830 ChangeLog 370
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 28738e856a3bdd2261ed6f5f8d1da385 ChangeLog 637
 MD5 66261856e93724759f19cabcb0e3e3cc metadata.xml 933
-MD5 b5b187ae4e69f07d3dd506345664e792 xar-20050423.ebuild 884
+MD5 71b1a6334b454938ef2d309aaf24d2b3 xar-20050423.ebuild 1084
 MD5 659c72ad6f5348b02f615073bc38f5f8 files/digest-xar-20050423 64
+MD5 685993b8b4270f7252084973decaba3d files/xar-20050423-amd64.patch 982
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCwZYTj5H05b2HAEkRAhJ8AJ0b2TmVpBelU7pzwBpaY9YO999yMwCfajil
+OoiC+VkYVoI7eEPBRlqCEQc=
+=Iz9i
+-----END PGP SIGNATURE-----
diff --git a/app-arch/xar/files/xar-20050423-amd64.patch b/app-arch/xar/files/xar-20050423-amd64.patch
new file mode 100644
index 000000000000..dd38453aea8b
--- /dev/null
+++ b/app-arch/xar/files/xar-20050423-amd64.patch
@@ -0,0 +1,23 @@
+diff -ur xar-20050423/lib/Makefile.in xar-20050423-amd64/lib/Makefile.in
+--- xar-20050423/lib/Makefile.in	2005-04-22 18:01:03.000000000 +0200
++++ xar-20050423-amd64/lib/Makefile.in	2005-06-28 19:54:32.963452168 +0200
+@@ -1,6 +1,6 @@
+ include ../Mk/autoconf.mk
+ 
+-CFLAGS += $(XML2_CFLAGS) -I../include
++CFLAGS += $(XML2_CFLAGS) -I../include -fPIC
+ LDFLAGS += $(XML2_LIBS) -L../lib/
+ LIBS += $(XML2_LIBS)
+ 
+diff -ur xar-20050423/Makefile.in xar-20050423-amd64/Makefile.in
+--- xar-20050423/Makefile.in	2005-04-22 18:39:09.000000000 +0200
++++ xar-20050423-amd64/Makefile.in	2005-06-28 20:00:42.454281024 +0200
+@@ -24,7 +24,7 @@
+ 	@make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIBRARY="$(LIBRARY)" $(notdir $(EXECUTABLE)) -C src/
+ 
+ $(LIBRARY): 
+-	@make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" $(LIB_FILE) -C lib/
++	@make CFLAGS="$(CFLAGS) -fPIC" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" $(LIB_FILE) -C lib/
+ 
+ .PHONY: install
+ install: $(EXECUTABLE) $(LIBRARY)
diff --git a/app-arch/xar/xar-20050423.ebuild b/app-arch/xar/xar-20050423.ebuild
index 220b71ad83dc..952a39f3f407 100644
--- a/app-arch/xar/xar-20050423.ebuild
+++ b/app-arch/xar/xar-20050423.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/xar-20050423.ebuild,v 1.1 2005/04/24 04:57:07 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/xar/xar-20050423.ebuild,v 1.2 2005/06/28 18:24:48 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -19,10 +19,21 @@ DEPEND="${RDEPEND}
 	dev-libs/libxml2
 	sys-libs/zlib"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-amd64.patch
+}
+
 src_compile() {
 	use debug && myconf="${myconf} --enable-symbols"
 	use ppc64 && myconf="${myconf} --enable-64bit"
 	use sparc && myconf="${myconf} --enable-64bit-vis"
+
+	# This is a var used by AMD64-multilib, unset this
+	# or we'll have problems during econf/emake
+	unset SYMLINK_LIB
+
 	econf ${myconf} || die
 	emake || die
 }