summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2008-12-08 16:24:58 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2008-12-08 16:24:58 +0000
commit1183b7aa28db96d4232f7ddb8b444cdebeaec67c (patch)
treedc5d25a074d0ab4dded4b948d1ef76bb80e53929 /gnustep-apps
parentVersion bump. (diff)
downloadgentoo-2-1183b7aa28db96d4232f7ddb8b444cdebeaec67c.tar.gz
gentoo-2-1183b7aa28db96d4232f7ddb8b444cdebeaec67c.tar.bz2
gentoo-2-1183b7aa28db96d4232f7ddb8b444cdebeaec67c.zip
Fix compilation with --as-needed, bug #250169
(Portage version: 2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64)
Diffstat (limited to 'gnustep-apps')
-rw-r--r--gnustep-apps/addresses/ChangeLog8
-rw-r--r--gnustep-apps/addresses/addresses-0.4.7.ebuild12
-rw-r--r--gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch25
3 files changed, 41 insertions, 4 deletions
diff --git a/gnustep-apps/addresses/ChangeLog b/gnustep-apps/addresses/ChangeLog
index 4251f7807e41..1e54d0a74ff5 100644
--- a/gnustep-apps/addresses/ChangeLog
+++ b/gnustep-apps/addresses/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-apps/addresses
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/ChangeLog,v 1.14 2007/11/16 15:22:55 beandog Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/ChangeLog,v 1.15 2008/12/08 16:24:58 voyageur Exp $
+
+ 08 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+ +files/addresses-0.4.7-as-needed.patch, addresses-0.4.7.ebuild:
+ Fix compilation with --as-needed, bug #250169
16 Nov 2007; Steve Dibb <beandog@gentoo.org> addresses-0.4.7.ebuild:
amd64 stable, bug 195990
diff --git a/gnustep-apps/addresses/addresses-0.4.7.ebuild b/gnustep-apps/addresses/addresses-0.4.7.ebuild
index 437a23c9bbf6..80865cdf681d 100644
--- a/gnustep-apps/addresses/addresses-0.4.7.ebuild
+++ b/gnustep-apps/addresses/addresses-0.4.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.7.ebuild,v 1.4 2007/11/16 15:22:55 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/addresses/addresses-0.4.7.ebuild,v 1.5 2008/12/08 16:24:58 voyageur Exp $
inherit gnustep-2
@@ -12,3 +12,11 @@ SRC_URI="http://savannah.nongnu.org/download/gap/${P/a/A}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+IUSE=""
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+}
diff --git a/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch b/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
new file mode 100644
index 000000000000..cdb7a84755e3
--- /dev/null
+++ b/gnustep-apps/addresses/files/addresses-0.4.7-as-needed.patch
@@ -0,0 +1,25 @@
+diff -Naur AddressManager.orig/GNUmakefile AddressManager/GNUmakefile
+--- AddressManager.orig/GNUmakefile 2008-12-08 17:19:03.000000000 +0100
++++ AddressManager/GNUmakefile 2008-12-08 17:19:28.000000000 +0100
+@@ -24,8 +24,7 @@
+ AddressManager_OBJCFLAGS=-I../Frameworks -Wall
+ AddressManager_LDFLAGS=\
+ -L../Frameworks/AddressView/AddressView.framework/$(GNUSTEP_TARGET_LDIR) \
+- -L../Frameworks/Addresses/Addresses.framework/$(GNUSTEP_TARGET_LDIR) \
+- -lAddressView -lAddresses
++ -L../Frameworks/Addresses/Addresses.framework/$(GNUSTEP_TARGET_LDIR)
+
+ -include GNUmakefile.preamble
+ -include GNUmakefile.local
+diff -Naur AddressManager.orig/GNUmakefile.preamble AddressManager/GNUmakefile.preamble
+--- AddressManager.orig/GNUmakefile.preamble 2008-12-08 17:19:03.000000000 +0100
++++ AddressManager/GNUmakefile.preamble 2008-12-08 17:19:24.000000000 +0100
+@@ -27,7 +27,7 @@
+ # ObjC stuff
+ ADDITIONAL_OBJC_LIBS +=
+ # Tools
+-ADDITIONAL_TOOL_LIBS +=
++ADDITIONAL_TOOL_LIBS += -lAddressView -lAddresses
+ # WebObjects
+ ADDITIONAL_WO_LIBS +=
+