summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-12-21 15:47:32 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-12-21 15:47:32 +0000
commit69859eb7093d459ebc25e090657ff68f54b86d58 (patch)
tree905b08ef0f394e96f4ab01899492fbb809d8da6a /games-util/joystick
parentsparc stable wrt #285414 (diff)
downloadhistorical-69859eb7093d459ebc25e090657ff68f54b86d58.tar.gz
historical-69859eb7093d459ebc25e090657ff68f54b86d58.tar.bz2
historical-69859eb7093d459ebc25e090657ff68f54b86d58.zip
Fix building with -Wl,--as-needed wrt #247514 by Kacper Kowalik.
Package-Manager: portage-2.2_rc59/cvs/Linux x86_64
Diffstat (limited to 'games-util/joystick')
-rw-r--r--games-util/joystick/ChangeLog6
-rw-r--r--games-util/joystick/Manifest5
-rw-r--r--games-util/joystick/files/joystick-20060731-asneeded.patch27
-rw-r--r--games-util/joystick/joystick-20060731.ebuild5
4 files changed, 38 insertions, 5 deletions
diff --git a/games-util/joystick/ChangeLog b/games-util/joystick/ChangeLog
index 1ebbd2f39ea2..b7169527e9ef 100644
--- a/games-util/joystick/ChangeLog
+++ b/games-util/joystick/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for games-util/joystick
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.7 2009/08/14 17:01:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/ChangeLog,v 1.8 2009/12/21 15:47:29 ssuominen Exp $
+
+ 21 Dec 2009; Samuli Suominen <ssuominen@gentoo.org>
+ joystick-20060731.ebuild, +files/joystick-20060731-asneeded.patch:
+ Fix building with -Wl,--as-needed wrt #247514 by Kacper Kowalik.
14 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org>
joystick-20060731.ebuild:
diff --git a/games-util/joystick/Manifest b/games-util/joystick/Manifest
index 6b5db9be09bf..10842b2116b6 100644
--- a/games-util/joystick/Manifest
+++ b/games-util/joystick/Manifest
@@ -1,6 +1,7 @@
+AUX joystick-20060731-asneeded.patch 810 RMD160 cc8d75c977ce713e0324169d2a76b9726a09ef89 SHA1 47e10ebfca585c446e2118f882128501e596adfc SHA256 d0e4282d85c1f8f614ac139d05691805ee965839cae9cec6ded5b7129860faab
AUX joystick-MCS-defines.patch 575 RMD160 1c3ee34bc75645dff552e0b22a8515e4b3bb3dbe SHA1 81d0fa629cc7c11e7336fc3b610c296418fbd777 SHA256 fc58bba55c2b158aa5615599c6433989df2d09204d1d2717728f50489fac0b61
AUX joystick-jstest-segv.patch 1561 RMD160 16585232d1edf36e492dea560a916e8a63e2567b SHA1 f59b280ad68880a336e6f86cedda6962a0a3c4ee SHA256 d0caec60e34eb2b60ae621ddaf3d5aeb6f0ca7efbcd10d0727c39a79153c873a
DIST joystick-20060731.tar.bz2 27411 RMD160 fea5a38160bb578c7d0ab380b7d5f7ceba490ca4 SHA1 9846e9750058728b75f5db9b4496af4c72dfb016 SHA256 17aa3ca45f6bbd2004d0cede4a0f1c32b4cabb946628a85602d89c45d874006b
-EBUILD joystick-20060731.ebuild 967 RMD160 c3f42b7a102a2cf7704ccbf1aa09bbeba5c47a0e SHA1 b4b49841532deaa6fd73bdcc61faf25296e2a4bc SHA256 3663119192dc50096cf3cc3c9859bb9dc347c7869445adaa01a2aa5850cccc96
-MISC ChangeLog 1220 RMD160 59835087a2934f5c7c180bbb1fa12fa87566d23f SHA1 5441c57b1f1275ada08f529ca8f821f4ba20aa92 SHA256 a9b32b18ef5b00b393f02c918759a8e9d8633f154c5415c6dd717c5894ba1cfa
+EBUILD joystick-20060731.ebuild 1005 RMD160 bae95786f6143393616a12519f4787ebaaa99158 SHA1 280d1d75a37687006354ac8e3936e055fc0d9000 SHA256 89ba724955c0742dbe754e8b3d3a4d5e98a3547a4062e4e2d66893d0c58a128f
+MISC ChangeLog 1411 RMD160 d65d6d552bcab78ad2c1425cb6f94937e967953b SHA1 5c3842d7486fa2b6fb974c4e6afada2164a2fb71 SHA256 5ec4b4a6aad26cdb3e3e9b4145e65df5ee285291f1d26b0992da1010ae441998
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
diff --git a/games-util/joystick/files/joystick-20060731-asneeded.patch b/games-util/joystick/files/joystick-20060731-asneeded.patch
new file mode 100644
index 000000000000..3bfe30f01ea2
--- /dev/null
+++ b/games-util/joystick/files/joystick-20060731-asneeded.patch
@@ -0,0 +1,27 @@
+--- utils.orig/Makefile 2006-07-31 06:50:01.000000000 +0200
++++ utils/Makefile 2009-12-09 20:11:17.962976029 +0100
+@@ -46,7 +45,7 @@
+
+ ffcfstress: ffcfstress.c
+ $(CC) $(CFLAGS) -funsigned-char \
+- -lm ffcfstress.c -o ffcfstress
++ ffcfstress.c -o ffcfstress -lm
+
+ ffmvforce.o: ffmvforce.c
+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $^ -o $@ `sdl-config --cflags`
+@@ -55,13 +54,13 @@
+ $(CC) $^ -o $@ $(LDFLAGS) $(CFLAGS) -lm `sdl-config --libs`
+
+ jscal: jscal.o
+- $(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
++ $(CC) $(CFLAGS) $(CPPFLAGS) $^ -o $@ -lm
+
+ gencodes: gencodes.c scancodes.h
+ $(CC) $(CFLAGS) $(CPPFLAGS) gencodes.c -o gencodes
+
+ acceltest: acceltest.c
+- $(CC) $(CFLAGS) $(CPPFLAGS) -lm $^ -o $@
++ $(CC) $(CFLAGS) $(CPPFLAGS) $^ -o $@ -lm
+
+ dist:
+ tar jcf ../joystick-`date +%Y%m%d`.tar.bz2 -C .. utils
diff --git a/games-util/joystick/joystick-20060731.ebuild b/games-util/joystick/joystick-20060731.ebuild
index 2771a27b7134..1649235b761d 100644
--- a/games-util/joystick/joystick-20060731.ebuild
+++ b/games-util/joystick/joystick-20060731.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-20060731.ebuild,v 1.5 2009/08/14 17:01:26 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/joystick/joystick-20060731.ebuild,v 1.6 2009/12/21 15:47:29 ssuominen Exp $
EAPI=2
inherit eutils toolchain-funcs
@@ -22,7 +22,8 @@ S=${WORKDIR}/utils
src_prepare() {
epatch \
"${FILESDIR}"/joystick-MCS-defines.patch \
- "${FILESDIR}"/joystick-jstest-segv.patch
+ "${FILESDIR}"/joystick-jstest-segv.patch \
+ "${FILESDIR}"/${P}-asneeded.patch
sed -i \
-e '/^CC/d' \
Makefile \