summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-03-20 03:25:14 +0000
committerMike Frysinger <vapier@gentoo.org>2006-03-20 03:25:14 +0000
commit1253d78c92e1db8c801f5260c9cb13622f8c04a8 (patch)
tree4d1f4fd78bce97b092654f9e0c339de4e161cb5e /app-arch/bzip2
parentscrub (diff)
downloadgentoo-2-1253d78c92e1db8c801f5260c9cb13622f8c04a8.tar.gz
gentoo-2-1253d78c92e1db8c801f5260c9cb13622f8c04a8.tar.bz2
gentoo-2-1253d78c92e1db8c801f5260c9cb13622f8c04a8.zip
fix by Diego Pettenò to respect custom LDFLAGS #126826
(Portage version: 2.1_pre6-r3)
Diffstat (limited to 'app-arch/bzip2')
-rw-r--r--app-arch/bzip2/bzip2-1.0.3-r6.ebuild3
-rw-r--r--app-arch/bzip2/files/bzip2-1.0.3-makefile-LDFLAGS.patch13
2 files changed, 15 insertions, 1 deletions
diff --git a/app-arch/bzip2/bzip2-1.0.3-r6.ebuild b/app-arch/bzip2/bzip2-1.0.3-r6.ebuild
index 45ead007ed11..1d7025c6f17d 100644
--- a/app-arch/bzip2/bzip2-1.0.3-r6.ebuild
+++ b/app-arch/bzip2/bzip2-1.0.3-r6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r6.ebuild,v 1.1 2006/02/06 23:20:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/bzip2/bzip2-1.0.3-r6.ebuild,v 1.2 2006/03/20 03:25:13 vapier Exp $
inherit eutils multilib toolchain-funcs flag-o-matic
@@ -26,6 +26,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-1.0.2-progress.patch
epatch "${FILESDIR}"/${PN}-1.0.2-chmod.patch
epatch "${FILESDIR}"/${P}-no-test.patch
+ epatch "${FILESDIR}"/${P}-makefile-LDFLAGS.patch #126826
sed -i -e 's:\$(PREFIX)/man:\$(PREFIX)/share/man:g' Makefile || die "sed manpath"
# - Generate symlinks instead of hardlinks
diff --git a/app-arch/bzip2/files/bzip2-1.0.3-makefile-LDFLAGS.patch b/app-arch/bzip2/files/bzip2-1.0.3-makefile-LDFLAGS.patch
new file mode 100644
index 000000000000..54c8fa95eaba
--- /dev/null
+++ b/app-arch/bzip2/files/bzip2-1.0.3-makefile-LDFLAGS.patch
@@ -0,0 +1,13 @@
+--- bzip2-1.0.3/Makefile-libbz2_so
++++ bzip2-1.0.3/Makefile-libbz2_so
+@@ -20,8 +20,8 @@ OBJS= blocksort.o \
+ bzlib.o
+
+ all: $(OBJS)
+- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.3 $(OBJS)
+- $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
++ $(CC) $(LDFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1 -o libbz2.so.1.0.3 $(OBJS)
++ $(CC) $(LDFLAGS) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.3
+ rm -f libbz2.so.1.0
+ ln -s libbz2.so.1.0.3 libbz2.so.1.0
+