sys-fs/unionfs-fuse: Fix underlinking (bug #435822)

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

5 files changed, 46 insertions, 7 deletions

diff --git a/sys-fs/unionfs-fuse/ChangeLog b/sys-fs/unionfs-fuse/ChangeLog
index 5650e2bc12aa..664487a66caf 100644
--- a/sys-fs/unionfs-fuse/ChangeLog
+++ b/sys-fs/unionfs-fuse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/unionfs-fuse
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/ChangeLog,v 1.7 2012/09/14 20:11:20 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/ChangeLog,v 1.8 2012/09/22 20:29:57 sping Exp $
+
+  22 Sep 2012; Sebastian Pipping <sping@gentoo.org> unionfs-fuse-0.26.ebuild,
+  +files/unionfs-fuse-0.26-declare-chroot.patch,
+  +files/unionfs-fuse-0.26-link-pthread.patch:
+  Fix underlinking to pthreads with GCC 4.7 (bug #435822), mainly. Patches
+  forwarded to upstream.
 
   14 Sep 2012; Sebastian Pipping <sping@gentoo.org> -unionfs-fuse-0.23.ebuild:
   Remove 0.23 ebuilds since upstream now considers 0.23 to be severely broken
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 19f125e30b7e..4e9adf2c4cd9 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -2,18 +2,20 @@
 Hash: SHA1
 
 AUX unionfs-fuse-0.23-makefile.patch 301 RMD160 3d88bfb8640c4e0721baa696163788eab878a814 SHA1 9da82adc61d2582880fc8b641e31e70ada6e0f69 SHA256 006dbd58cf9bf017b11bea4a6dad3b45ac2636fd62c52d9fb03d71edc66300e5
+AUX unionfs-fuse-0.26-declare-chroot.patch 312 RMD160 cef5498cd4f125ad7b38b476cb0e0ef588cbf647 SHA1 2ad0d8a0332654de3492263571970b7bec44975c SHA256 402258decbba9057891eb25a6f75fd9c358113eccd3b1f9c32d18bedda123330
+AUX unionfs-fuse-0.26-link-pthread.patch 347 RMD160 40cec9822f2b95733cfb488ca50fe869e0b37a7a SHA1 d25e85d5c3af942b15f85e086ebb65ee7219f31c SHA256 32cb895e3fffa87c58efa5632dd6dfc07dd4a64b1b60942244bee3f58cc514bd
 DIST unionfs-fuse-0.24.tar.bz2 30381 RMD160 27934c23472f6e9d71e622f13aa9fd51a1f8018e SHA1 26f281e4e5f1e82194b430956b94cd7745d5bd97 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937
 DIST unionfs-fuse-0.25.tar.bz2 30674 RMD160 7f9672c66644a306188363df6eac2d39e3aab610 SHA1 1a67baff0fe612fe21320fd3c3244935164c4bd9 SHA256 a33f0a8c4ec35108f173a7a96463222534c21b3a50c167a7c868fc5723347e8f
 DIST unionfs-fuse-0.26.tar.xz 38600 RMD160 7dc2422ff5f411cf7bcb98a61fb62ae6585d58c1 SHA1 564d6d607a2c830af6ea67f97b9f2b575a92c64c SHA256 8d5c9dcb51ecb9a9b03890e16d17e37d602b0c1f23ed6a9ddec2b0f719c9f662
 EBUILD unionfs-fuse-0.24.ebuild 664 RMD160 9c6e432586029eaf65a0ce61f06db80966f07ad9 SHA1 15b56ec15f4c7b7f2ab79170fa33ce45f96632ac SHA256 02faccbdd247bce0f8c2aea70e0d1ccb01b811f295e334db61d77ad4750d2a80
 EBUILD unionfs-fuse-0.25.ebuild 664 RMD160 531fa4659ddedf23afbad515225e4a5c0aebc6de SHA1 7fb598a6ca1a4de7ef7d420a9c6fc739d8270cce SHA256 5832fe234bbdbad6103bed7fd85a2dd0eaf754c86eea1bf88a2049ca4382d411
-EBUILD unionfs-fuse-0.26.ebuild 663 RMD160 13f802baaa62d30e43618720ac1658b78bfaf25d SHA1 1cfc4e63a37b08a606c1d338ddf6898a17cb8f50 SHA256 31284839940e53c22f079fc381357f21e9e9c4c63b6e81dfe2b25d413dc7bdbb
-MISC ChangeLog 1195 RMD160 b5ed092d095ce3624de658d96bd43352b1ccad98 SHA1 8673746ab4f4ddad911ff81b16a0aeddb15d25e9 SHA256 415f4fe1661379d3cfde062115061d190a3ed527f6b76a823c2ba7b434f32b25
+EBUILD unionfs-fuse-0.26.ebuild 793 RMD160 c4cc49a3cf5429a948b797a7cb5802a5a8f8ca93 SHA1 608f14823e5ca09643f7ad22f1c2f4dbb3bad611 SHA256 ddecd10f66724bc0ed47932be7757aca40d3ddfa5e05530cb534d6b5a69ebdf8
+MISC ChangeLog 1470 RMD160 df0f346257c08fc6a34db661c7986b108a5668a7 SHA1 a28e87b5c5ba0b97b855e80653ac3438bcd7fedc SHA256 098e69540855266cc4aaceec408c1261e5decef4a4c3a4e56fb1371aec9328aa
 MISC metadata.xml 235 RMD160 e964157be48c204555d79827e1bf79c9d9fb23a5 SHA1 767b5eb408113ae55d84adcb94d44a692285d175 SHA256 095e4ee6b3ae673e7ddf0d4e166a632d3384d6374c6dd86d8c401a8f5c43f7fe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAlBTj2IACgkQsAvGakAaFgAgcQCeNKJq5i3lJZaOpqdyCavWMldO
-SgwAoKL5a1HvdWI6bCTiUAOUJdrQeYA6
-=PHiq
+iEYEARECAAYFAlBeH8YACgkQsAvGakAaFgC6UACguytJGry+NENSv3RgsWXPJqB9
+jOMAoMDCs2Xa3G04gdcscvLbXZEgk8d3
+=U1kR
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch
new file mode 100644
index 000000000000..e436f9f01575
--- /dev/null
+++ b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-declare-chroot.patch
@@ -0,0 +1,12 @@
+--- unionfs-fuse-0.26/src/unionfs.c	2012-09-22 22:24:05.090568485 +0200
++++ unionfs-fuse-0.26/src/unionfs.c	2012-09-22 22:24:09.036519156 +0200
+@@ -13,6 +13,9 @@
+ #ifdef linux
+ 	// For pread()/pwrite()/utimensat()
+ 	#define _XOPEN_SOURCE 700
++	
++	// For chroot
++	#define _BSD_SOURCE
+ #endif
+ 
+ #include <fuse.h>
diff --git a/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch
new file mode 100644
index 000000000000..9bed29fe2ed7
--- /dev/null
+++ b/sys-fs/unionfs-fuse/files/unionfs-fuse-0.26-link-pthread.patch
@@ -0,0 +1,11 @@
+--- src/Makefile	2012-09-22 22:14:36.484677038 +0200
++++ src/Makefile	2012-09-22 22:14:40.162631059 +0200
+@@ -5,7 +5,7 @@
+ 
+ LDFLAGS += 
+ 
+-LIB = $(shell pkg-config --libs fuse)
++LIB = $(shell pkg-config --libs fuse) -lpthread
+ 
+ HASHTABLE_OBJ = hashtable.o hashtable_itr.o
+ UNIONFS_OBJ = unionfs.o stats.o opts.o debug.o findbranch.o readdir.o \
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild
index 6cee78706f42..4b8d5155df35 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild
@@ -1,9 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild,v 1.1 2012/09/14 20:07:13 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/unionfs-fuse/unionfs-fuse-0.26.ebuild,v 1.2 2012/09/22 20:29:57 sping Exp $
 
 EAPI="3"
 
+inherit eutils
+
+
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
 
 HOMEPAGE="http://podgorny.cz/moin/UnionFsFuse"
@@ -17,6 +20,11 @@ IUSE=""
 DEPEND="sys-fs/fuse"
 RDEPEND="${DEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-link-pthread.patch
+	epatch "${FILESDIR}"/${P}-declare-chroot.patch
+}
+
 src_install() {
 	dodir /usr/sbin /usr/share/man/man8/ || die "dodir failed"
 	emake DESTDIR="${D}" PREFIX="/usr" install || die "emake install failed"