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

(Portage version: 2.1.10.65/cvs/Linux x86_64)

4 files changed, 39 insertions, 2 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/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"