summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-04-22 11:18:32 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-04-22 11:18:32 +0000
commit0b382d4806bb5dfeedd275df1a4f65d786851519 (patch)
treeb2423f81dd67237f81b13ef00c24d45dec08718c /net-wireless
parentFixed patch location for x86 and a sed function (diff)
downloadgentoo-2-0b382d4806bb5dfeedd275df1a4f65d786851519.tar.gz
gentoo-2-0b382d4806bb5dfeedd275df1a4f65d786851519.tar.bz2
gentoo-2-0b382d4806bb5dfeedd275df1a4f65d786851519.zip
Add a patch to respect LDFLAGS on the shared library and fix buidling with --as-needed turned on.
(Portage version: 2.1.5_rc5)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/wireless-tools/ChangeLog7
-rw-r--r--net-wireless/wireless-tools/files/wireless-tools-29-asneeded.patch13
-rw-r--r--net-wireless/wireless-tools/wireless-tools-29.ebuild4
3 files changed, 22 insertions, 2 deletions
diff --git a/net-wireless/wireless-tools/ChangeLog b/net-wireless/wireless-tools/ChangeLog
index 43f569b6b638..0bbb330e9841 100644
--- a/net-wireless/wireless-tools/ChangeLog
+++ b/net-wireless/wireless-tools/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-wireless/wireless-tools
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.130 2008/03/12 16:11:08 phreak Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.131 2008/04/22 11:18:31 flameeyes Exp $
+
+ 22 Apr 2008; Diego Pettenò <flameeyes@gentoo.org>
+ +files/wireless-tools-29-asneeded.patch, wireless-tools-29.ebuild:
+ Add a patch to respect LDFLAGS on the shared library and fix buidling with
+ --as-needed turned on.
12 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml:
Removing Peter Johanson (latexer, #206688) from metadata.xml.
diff --git a/net-wireless/wireless-tools/files/wireless-tools-29-asneeded.patch b/net-wireless/wireless-tools/files/wireless-tools-29-asneeded.patch
new file mode 100644
index 000000000000..04f2d869b6d2
--- /dev/null
+++ b/net-wireless/wireless-tools/files/wireless-tools-29-asneeded.patch
@@ -0,0 +1,13 @@
+Index: wireless_tools.29/Makefile
+===================================================================
+--- wireless_tools.29.orig/Makefile
++++ wireless_tools.29/Makefile
+@@ -145,7 +145,7 @@ wireless.h:
+
+ # Compilation of the dynamic library
+ $(DYNAMIC): $(OBJS:.o=.so)
+- $(CC) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $(LIBS) -lc $^
++ $(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname,$@ $(STRIPFLAGS) $^ $(LIBS) -lc
+
+ # Compilation of the static library
+ $(STATIC): $(OBJS:.o=.so)
diff --git a/net-wireless/wireless-tools/wireless-tools-29.ebuild b/net-wireless/wireless-tools/wireless-tools-29.ebuild
index 7a1905f5674b..b9d58c1b8a7b 100644
--- a/net-wireless/wireless-tools/wireless-tools-29.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-29.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-29.ebuild,v 1.7 2008/01/13 08:56:21 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-29.ebuild,v 1.8 2008/04/22 11:18:31 flameeyes Exp $
inherit toolchain-funcs multilib
@@ -23,6 +23,8 @@ RDEPEND="virtual/libc"
src_unpack() {
unpack ${A}
+ epatch "${FILESDIR}/${P}-asneeded.patch"
+
sed -i \
-e "s:^\(CC\) = gcc:\1 = $(tc-getCC):" \
-e "s:^\(AR\) = ar:\1 = $(tc-getAR):" \