Fix pthread underlinking.

Package-Manager: portage-2.2.8_p53/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 40 insertions, 7 deletions

diff --git a/games-puzzle/picpuz/ChangeLog b/games-puzzle/picpuz/ChangeLog
index 24c617adba6b..f110928c9261 100644
--- a/games-puzzle/picpuz/ChangeLog
+++ b/games-puzzle/picpuz/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-puzzle/picpuz
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.17 2013/01/24 00:20:53 mr_bones_ Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/ChangeLog,v 1.18 2014/03/02 19:27:15 slyfox Exp $
+
+  02 Mar 2014; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/picpuz-2.5-pthread-underlinking.patch, picpuz-2.5.ebuild:
+  Fix pthread underlinking.
 
   24 Jan 2013; Michael Sterrett <mr_bones_@gentoo.org>
   -files/picpuz-2.1.1-build.patch, -picpuz-2.1.1.ebuild:
diff --git a/games-puzzle/picpuz/Manifest b/games-puzzle/picpuz/Manifest
index 320b86acb19f..e1208ca0fafd 100644
--- a/games-puzzle/picpuz/Manifest
+++ b/games-puzzle/picpuz/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX picpuz-2.5-build.patch 5499 SHA256 25784542c35c1a0847db8b293190c03e66198af1389bf8f397abcaeedc3733c0 SHA512 49486aa996419da06fa7a14ac61c89930c1ca79f97615253bc1c4a96c7bc0af405d52661e1dd4b5186cf00877cde5b698070bbb9229d50e27a1a981de03d2f11 WHIRLPOOL 3d176a4a51e0a41ddb655bcd8d55bff9f7868f8a268e1cbb827f72bc9f4f79e5dc21b04e6dcaed7f0bfdb4b035667678bc25c588aa4200a29ad2d2ee58e415b1
+AUX picpuz-2.5-pthread-underlinking.patch 842 SHA256 ec3252815f421a0bb60b680479d2da68f5672abb1b556dcf577bbac4da2e7306 SHA512 12c5d7e46d9db2312b24524c33877d9fcf2c6f94bf822d03bd24f021d91496b1759af078582311663e28c98405d274ee30179140b92e44b9ddaca4b40a05e658 WHIRLPOOL 498f3775367ddc1afd4a8838ce5cea0a0d7c6f1a1a44836ffc42cbfa093c08b0d985defae9807e0b6161878fb45ba3882f89e6398e649085bb34512c780e2602
 DIST picpuz-2.5.tar.gz 267452 SHA256 3caf92b00dd4739f68c557d5c952216fef01ca5de3c83e453ef177648bdf70f0 SHA512 598507b29b1218f05ca8a0d1a5788607cd3db899cad83ce84606d268d513c75b863986d518f0ec134cac0a5879515a13cb794f87a59bf55b48217fc6b1f5c386 WHIRLPOOL 0496c45d377a6fda3ce795a85fa640c06bf51c7308c164b3e08d76c125727d468eb4836657f11a3435341defd58eea03dee5d7c9b7386d2ede9974227dd2c614
-EBUILD picpuz-2.5.ebuild 1173 SHA256 d9d5a1857e898f99d329b52674febd9d2091162194d2196eef4a9128531f976f SHA512 2a4b95d862305e0c07d32249b3db57c9872aa6932b92b751852ac714bf941fc9959e9d5a0ba7e9d01d7f5f0e6db2b396c0691685dfc40e3f8382245c8073ae0a WHIRLPOOL 87e7ade84f33dfd64b72f573eecaf276488c7242c77be5ecddaba3f1d5932f2de6740766d6400d258f108d9edc5ca7afabe818030ee645c6dff107570fb37dc6
-MISC ChangeLog 2477 SHA256 c222823cf828c749116d3b90e18b0e94d60a0ef2c214e100d89ac8e717a03905 SHA512 f462572b34fc7d33466232b18a31006aab660822d9a22a28d10822d87e3e68d48e3f4698b718adf7c3f3fd137d71215f24a61ba2b603657d1d92326ea506c2dd WHIRLPOOL 56814a8684d0ce0679e414355427b9f2b999a508f35a95b33abc7d8cdc3fd9840c3eb7a95d9562e6faba181baeb4e974835d7428c8a2da2c137ca77033392498
+EBUILD picpuz-2.5.ebuild 1221 SHA256 428938339f3b154fd0eb197d80950248a016c0bb6b4458af6edc64a5c14d7a84 SHA512 0580cf7b62b9c24e98b4ac14cd99da870fc1acce93c9ddb695904de3780660e61df06c9924904937674af56cb4cd7380a95059495be05d4b808de902f04f77de WHIRLPOOL 76f2707f91b230c9a8cc18924b8adf716599c063834b4e90c78f98c01f92ce6fba9af95873dea7501d7b8fc2538f058cf5ef1db8ec127a7db75fd1a4d6a2bc32
+MISC ChangeLog 2624 SHA256 419ce8429ee961570e7cf498d8f84ecd28430e5bf36e317f561d5051d4a5b255 SHA512 34737da00137d86970fcd0eba441999762bdcd6ebda49c2125d526c11cc7c7443d09212505e548a1cee6ff94a038f30193d6250bc53b1a3c0b062c44d430652b WHIRLPOOL dc6f318d6402a9154584c3e7e000c19ed1514fe56ae3e0ad1e7abbda783539021b0ec4ee57f5e4f92e1013326d82aebadc6c10c58a07034508b49033ffc2391a
 MISC metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 SHA512 d954564236b67b6ab97846b73f74e715e8f1bec2dba6595e9a5046c2e8c3b93f4879c293f9d1d02d99a533bee56156dae3f31a485697128c51af14cdbfdada8a WHIRLPOOL d03e7293d09d794d61c095a423f945b3644355a247f270a73ca8d30b4dfe9c98244297536bfd1a4bd6c14794aa1152eca20fd83bfdf3e1e74d4f676152d35ada
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlMThgEACgkQcaHudmEf86qbiQCfdyE6e6OkvVZV9Xbe5kM+Gf6d
+upgAn3xNUpvCIQpLx2ktpFwbk2qI/cHI
+=GUBp
+-----END PGP SIGNATURE-----
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
new file mode 100644
index 000000000000..652231f1d4ff
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
@@ -0,0 +1,18 @@
+Fix underlinking on recent binutils:
+
+> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
+> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
+> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
+diff --git a/Makefile b/Makefile
+index 28638de..700b610 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
+ MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
+ 
+ CXXFLAGS += -c `pkg-config --cflags gtk+-3.0`
+-LIBS = `pkg-config --libs gtk+-3.0`
++LIBS = -pthread `pkg-config --libs gtk+-3.0`
+ 
+ $(PROGRAM): $(PROGRAM).o zfuncs.o
+ 	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5.ebuild b/games-puzzle/picpuz/picpuz-2.5.ebuild
index 270a57137ca9..4c804697b7af 100644
--- a/games-puzzle/picpuz/picpuz-2.5.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-2.5.ebuild,v 1.3 2012/08/07 22:30:26 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-puzzle/picpuz/picpuz-2.5.ebuild,v 1.4 2014/03/02 19:27:15 slyfox Exp $
 
 EAPI=4
 inherit eutils gnome2-utils games
@@ -18,7 +18,7 @@ RDEPEND="x11-libs/gtk+:3"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=( "${FILESDIR}"/${P}-build.patch "${FILESDIR}"/${P}-pthread-underlinking.patch )
 
 src_compile() {
 	emake \