diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2011-10-20 22:46:24 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2011-10-21 08:12:32 +0200 |
| commit | 949ec2d7319205a3a0366d18291a92541dfa038c (patch) | |
| tree | 82ac467654fb3531b2eb9ef71178eee3a4e36602 /meta-oe/recipes-support | |
| parent | b7425b1a83e556a5bdcc557c17e4ab8943c36637 (diff) | |
| download | meta-openembedded-949ec2d7319205a3a0366d18291a92541dfa038c.tar.gz | |
fuse: Fix linking issues with gold linker
fuse has problems when linking with gold since it uses version
scripts in a way thats so perticular to bfd ld
/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstrom-linux-gnueabi/4.6.2/ld:
error: symbol __fuse_exited has undefined version
| collect2: ld returned 1 exit status
| make[1]: *** [libfuse.la] Error 1
| make[1]: *** Waiting for unfinished jobs....
For more details
http://blog.flameeyes.eu/2011/06/01/gold-readiness-obstacle-2-base-versioning
http://sources.redhat.com/bugzilla/show_bug.cgi?id=10861
http://comments.gmane.org/gmane.comp.file-systems.fuse.devel/9524
http://www.airs.com/blog/archives/300
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-support')
| -rw-r--r-- | meta-oe/recipes-support/fuse/fuse-2.8.6/gold-unversioned-symbol.patch | 60 | ||||
| -rw-r--r-- | meta-oe/recipes-support/fuse/fuse_2.8.6.bb | 3 |
2 files changed, 62 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/fuse/fuse-2.8.6/gold-unversioned-symbol.patch b/meta-oe/recipes-support/fuse/fuse-2.8.6/gold-unversioned-symbol.patch new file mode 100644 index 0000000000..8ee97dff0f --- /dev/null +++ b/meta-oe/recipes-support/fuse/fuse-2.8.6/gold-unversioned-symbol.patch @@ -0,0 +1,60 @@ +Index: fuse-2.8.6/lib/fuse.c +=================================================================== +--- fuse-2.8.6.orig/lib/fuse.c 2011-09-13 00:23:14.000000000 -0700 ++++ fuse-2.8.6/lib/fuse.c 2011-10-19 09:20:27.537099939 -0700 +@@ -3947,11 +3947,11 @@ + 11); + } + +-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); +-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); +-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); +-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); +-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); ++FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED"); + FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); + + #endif /* __FreeBSD__ */ +Index: fuse-2.8.6/lib/fuse_mt.c +=================================================================== +--- fuse-2.8.6.orig/lib/fuse_mt.c 2011-09-13 00:23:14.000000000 -0700 ++++ fuse-2.8.6/lib/fuse_mt.c 2011-10-19 09:20:27.537099939 -0700 +@@ -113,4 +113,4 @@ + return fuse_session_loop_mt(fuse_get_session(f)); + } + +-FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@"); ++FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED"); +Index: fuse-2.8.6/lib/fuse_versionscript +=================================================================== +--- fuse-2.8.6.orig/lib/fuse_versionscript 2011-09-13 00:23:14.000000000 -0700 ++++ fuse-2.8.6/lib/fuse_versionscript 2011-10-19 09:20:27.541099939 -0700 +@@ -1,3 +1,6 @@ ++FUSE_UNVERSIONED { ++}; ++ + FUSE_2.2 { + global: + fuse_destroy; +Index: fuse-2.8.6/lib/helper.c +=================================================================== +--- fuse-2.8.6.orig/lib/helper.c 2011-09-13 00:23:14.000000000 -0700 ++++ fuse-2.8.6/lib/helper.c 2011-10-19 09:20:27.541099939 -0700 +@@ -409,10 +409,10 @@ + return fuse_mount_compat22(mountpoint, NULL); + } + +-FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@"); ++FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED"); + FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); +-FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); +-FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); ++FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED"); ++FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED"); + FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); + + #endif /* __FreeBSD__ */ diff --git a/meta-oe/recipes-support/fuse/fuse_2.8.6.bb b/meta-oe/recipes-support/fuse/fuse_2.8.6.bb index ec81a98334..15e9206db6 100644 --- a/meta-oe/recipes-support/fuse/fuse_2.8.6.bb +++ b/meta-oe/recipes-support/fuse/fuse_2.8.6.bb @@ -5,10 +5,11 @@ LICENSE = "GPLv2&LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" -PR = "r0" +PR = "r1" SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz \ file://define_GNU_SOURCE.patch \ + file://gold-unversioned-symbol.patch \ " SRC_URI[md5sum] = "eaa32c8cef56a981656a786f258a002a" |