From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SoMi7-0006Bu-Nk for garchives@archives.gentoo.org; Mon, 09 Jul 2012 22:45:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D372321C04C; Mon, 9 Jul 2012 22:45:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A59F721C04C for ; Mon, 9 Jul 2012 22:45:11 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19886641D4 for ; Mon, 9 Jul 2012 22:45:11 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D699EE543E for ; Mon, 9 Jul 2012 22:45:08 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1341873791.b59e62086df523876b9acbfb74a2d5e05a07bfc7.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_compile.sh X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: b59e62086df523876b9acbfb74a2d5e05a07bfc7 X-VCS-Branch: master Date: Mon, 9 Jul 2012 22:45:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 8a29f5cc-3f29-4834-ad8d-f9e040c37fe2 X-Archives-Hash: b1d54337e0209433ab7f64103058100d commit: b59e62086df523876b9acbfb74a2d5e05a07bfc7 Author: Sebastian Pipping pipping org> AuthorDate: Mon Jul 9 22:42:30 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Jul 9 22:43:11 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3Db59e6208 Fix linking of unionfs-fuse 0.24 --- ChangeLog | 3 +++ gen_compile.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2752e7d..289e9fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ =20 + 09 Jul 2012; Sebastian Pipping gen_compile.sh: + Fix linking of unionfs-fuse 0.24 + 09 Jul 2012; Sebastian Pipping patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch: Allow compilation of FUSE 2.8.6 with glibc 2.14 (bug #370411) diff --git a/gen_compile.sh b/gen_compile.sh index f1c7405..cbd3432 100755 --- a/gen_compile.sh +++ b/gen_compile.sh @@ -616,7 +616,7 @@ compile_unionfs_fuse() { apply_patches unionfs-fuse ${UNIONFS_FUSE_VER} print_info 1 'unionfs-fuse: >> Compiling...' sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -static -I${TEMP}/${FU= SE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile - sed -i "/^LIB =3D /s:^LIB =3D \(.*\)$:LIB =3D -static -L${TEMP}/${FUSE= _DIR}/lib/.libs \1 -ldl -lrt:" Makefile src/Makefile + sed -i "/^LIB =3D /s:^LIB =3D \(.*\)$:LIB =3D -static -L${TEMP}/${FUSE= _DIR}/lib/.libs \1 -ldl -lpthread -lrt:" Makefile src/Makefile MAKE=3D${UTILS_MAKE} compile_generic "" "" print_info 1 'unionfs-fuse: >> Copying to cache...' [ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] ||