diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-06-28 18:24:48 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-06-28 18:24:48 +0000 |
| commit | ce37ae00d37b89a332ece8b3182506d597c63717 (patch) | |
| tree | a34eacb80d558389f09755515ad09d9477c93dee /app-arch/xar | |
| parent | Version Bump (diff) | |
| download | gentoo-2-ce37ae00d37b89a332ece8b3182506d597c63717.tar.gz gentoo-2-ce37ae00d37b89a332ece8b3182506d597c63717.tar.bz2 gentoo-2-ce37ae00d37b89a332ece8b3182506d597c63717.zip | |
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.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-arch/xar')
| -rw-r--r-- | app-arch/xar/ChangeLog | 7 | ||||
| -rw-r--r-- | app-arch/xar/files/xar-20050423-amd64.patch | 23 | ||||
| -rw-r--r-- | app-arch/xar/xar-20050423.ebuild | 13 |
3 files changed, 41 insertions, 2 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/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 } |