summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-06-29 16:08:40 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-06-29 16:08:40 +0000
commit58df4d60bf0fa2c4574e36b8a871c82b4dd63791 (patch)
treed2945d4dd1597b4c4ec0ed1dda3ce91dcc36a10b /net-wireless
parentFix building with -Wl,--as-needed wrt #320349 by Kacper Kowalik. (diff)
downloadgentoo-2-58df4d60bf0fa2c4574e36b8a871c82b4dd63791.tar.gz
gentoo-2-58df4d60bf0fa2c4574e36b8a871c82b4dd63791.tar.bz2
gentoo-2-58df4d60bf0fa2c4574e36b8a871c82b4dd63791.zip
Fix building with -Wl,--as-needed wrt #318135 by Kacper Kowalik.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/irda-utils/ChangeLog6
-rw-r--r--net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch15
-rw-r--r--net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild13
3 files changed, 27 insertions, 7 deletions
diff --git a/net-wireless/irda-utils/ChangeLog b/net-wireless/irda-utils/ChangeLog
index 6388def15e5b..0cc4ffbf9302 100644
--- a/net-wireless/irda-utils/ChangeLog
+++ b/net-wireless/irda-utils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/irda-utils
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.35 2010/04/28 22:27:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/ChangeLog,v 1.36 2010/06/29 16:08:39 ssuominen Exp $
+
+ 29 Jun 2010; Samuli Suominen <ssuominen@gentoo.org>
+ irda-utils-0.9.18-r3.ebuild, +files/irda-utils-0.9.18-asneeded.patch:
+ Fix building with -Wl,--as-needed wrt #318135 by Kacper Kowalik.
28 Apr 2010; Jeroen Roovers <jer@gentoo.org> irda-utils-0.9.18-r3.ebuild,
+files/irda-utils-0.9.18-dofail.patch:
diff --git a/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
new file mode 100644
index 000000000000..26937a042c2b
--- /dev/null
+++ b/net-wireless/irda-utils/files/irda-utils-0.9.18-asneeded.patch
@@ -0,0 +1,15 @@
+Fixing as-needed issues
+
+http://bugs.gentoo.org/show_bug.cgi?id=318135
+
+--- irdadump/Makefile
++++ irdadump/Makefile
+@@ -40,7 +40,7 @@
+
+ irdadump: $(IRDADUMP_OBJS) $(LIBIRDADUMP_TARGET)
+ $(prn_cc_o)
+- $(ECMD)$(CC) $(CFLAGS) `pkg-config --libs glib-2.0` -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET)
++ $(ECMD)$(CC) $(CFLAGS) -o $(IRDADUMP_TARGET) $< $(LIBIRDADUMP_TARGET) `pkg-config --libs glib-2.0`
+
+
+ .c.o:
diff --git a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
index 0a9c5d3207c6..f6153cafb5b1 100644
--- a/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
+++ b/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.6 2010/04/28 22:27:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/irda-utils/irda-utils-0.9.18-r3.ebuild,v 1.7 2010/06/29 16:08:39 ssuominen Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -27,11 +27,12 @@ src_unpack() {
unpack ${A}
cd "${S}"
- epatch "${FILESDIR}/irda-utils-rh1.patch"
- epatch "${FILESDIR}/${P}-makefile.diff"
- epatch "${FILESDIR}/${P}-smcinit.diff"
- epatch "${FILESDIR}/${P}-io.h.diff"
- epatch "${FILESDIR}/${P}-dofail.patch"
+ epatch "${FILESDIR}"/irda-utils-rh1.patch \
+ "${FILESDIR}"/${P}-makefile.diff \
+ "${FILESDIR}"/${P}-smcinit.diff \
+ "${FILESDIR}"/${P}-io.h.diff \
+ "${FILESDIR}"/${P}-dofail.patch \
+ "${FILESDIR}"/${P}-asneeded.patch
# fix crosscompile, respect CFLAGS (Bug 200295)
sed -i -e "/^CC/s:gcc:$(tc-getCC):" \