| 1 |
commit: b59e62086df523876b9acbfb74a2d5e05a07bfc7 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Mon Jul 9 22:42:30 2012 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 9 22:43:11 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=b59e6208 |
| 7 |
|
| 8 |
Fix linking of unionfs-fuse 0.24 |
| 9 |
|
| 10 |
--- |
| 11 |
ChangeLog | 3 +++ |
| 12 |
gen_compile.sh | 2 +- |
| 13 |
2 files changed, 4 insertions(+), 1 deletions(-) |
| 14 |
|
| 15 |
diff --git a/ChangeLog b/ChangeLog |
| 16 |
index 2752e7d..289e9fa 100644 |
| 17 |
--- a/ChangeLog |
| 18 |
+++ b/ChangeLog |
| 19 |
@@ -5,6 +5,9 @@ |
| 20 |
# Distributed under the GPL v2 |
| 21 |
# $Id$ |
| 22 |
|
| 23 |
+ 09 Jul 2012; Sebastian Pipping <sping@g.o> gen_compile.sh: |
| 24 |
+ Fix linking of unionfs-fuse 0.24 |
| 25 |
+ |
| 26 |
09 Jul 2012; Sebastian Pipping <sping@g.o> |
| 27 |
patches/fuse/2.8.6/fuse-2.8.6-glibc-2.14.patch: |
| 28 |
Allow compilation of FUSE 2.8.6 with glibc 2.14 (bug #370411) |
| 29 |
|
| 30 |
diff --git a/gen_compile.sh b/gen_compile.sh |
| 31 |
index f1c7405..cbd3432 100755 |
| 32 |
--- a/gen_compile.sh |
| 33 |
+++ b/gen_compile.sh |
| 34 |
@@ -616,7 +616,7 @@ compile_unionfs_fuse() { |
| 35 |
apply_patches unionfs-fuse ${UNIONFS_FUSE_VER} |
| 36 |
print_info 1 'unionfs-fuse: >> Compiling...' |
| 37 |
sed -i "/^\(CFLAGS\|CPPFLAGS\)/s:^\\(.*\\)$:\\1 -static -I${TEMP}/${FUSE_DIR}/include -L${TEMP}/${FUSE_DIR}/lib/.libs:" Makefile src/Makefile |
| 38 |
- sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lrt:" Makefile src/Makefile |
| 39 |
+ sed -i "/^LIB = /s:^LIB = \(.*\)$:LIB = -static -L${TEMP}/${FUSE_DIR}/lib/.libs \1 -ldl -lpthread -lrt:" Makefile src/Makefile |
| 40 |
MAKE=${UTILS_MAKE} compile_generic "" "" |
| 41 |
print_info 1 'unionfs-fuse: >> Copying to cache...' |
| 42 |
[ -f "${TEMP}/${UNIONFS_FUSE_DIR}/src/unionfs" ] || |
Archives