diff options
| -rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/dso_linking_change_build_fix.patch | 29 | ||||
| -rw-r--r-- | meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb | 5 |
2 files changed, 2 insertions, 32 deletions
diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/dso_linking_change_build_fix.patch b/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/dso_linking_change_build_fix.patch deleted file mode 100644 index 5f0cce2e1e..0000000000 --- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz-3.0.3/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -dso build fix: -With a dso patch for gcc, which prevents automatic linking of unspecified libraries, -this recipe fails to compile with this error: - -| Linking CXX executable cdlookup^M -| cd /disk0/pokybuild/build1/tmp/work/i586-poky-linux/libmusicbrainz-3.0.3-r0/libmusicbrainz-3.0.3/examples && /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/bin/cmake -E cmake_link_script CMakeFiles/cdlookup.dir/link.txt --verbose=1^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/bin/i586-poky-linux/i586-poky-linux-g++ -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fpermissive -Wl,-O1 -Wl,--as-needed CMakeFiles/cdlookup.dir/cdlookup.cpp.o -o cdlookup -rdynamic ../src/libmusicbrainz3.so.6.3.0 -lneon -Wl,-rpath,/disk0/pokybuild/build1/tmp/work/i586-poky-linux/libmusicbrainz-3.0.3-r0/libmusicbrainz-3.0.3/src^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ~I: invalid DSO for symbol `pthread_cancel@@GLIBC_2.0' definition^M -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/lib/libpthread.so.0: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make[2]: *** [examples/cdlookup] Error 1^M -| make[2]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/libmusicbrainz-3.0.3-r0/libmusicbrainz-3.0.3' - -fixing the issue by making linking of libpthread explicit. - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/10 - -Index: libmusicbrainz-3.0.3/examples/CMakeLists.txt -=================================================================== ---- libmusicbrainz-3.0.3.orig/examples/CMakeLists.txt -+++ libmusicbrainz-3.0.3/examples/CMakeLists.txt -@@ -1,5 +1,5 @@ - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) --LINK_LIBRARIES(musicbrainz3 ${NEON_LIBRARIES}) -+LINK_LIBRARIES(musicbrainz3 ${NEON_LIBRARIES} pthread) - ADD_EXECUTABLE(cdlookup cdlookup.cpp) - ADD_EXECUTABLE(findartist findartist.cpp) - ADD_EXECUTABLE(findtrack findtrack.cpp) diff --git a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb index bd3c213db9..861e6fc72f 100644 --- a/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb +++ b/meta/recipes-multimedia/musicbrainz/libmusicbrainz_3.0.3.bb @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=fbc093901857fcd118f065f900982c24 \ file://include/musicbrainz3/includes.h;beginline=1;endline=21;md5=9ab2846573f560cea7561da472803a72" DEPENDS = "expat neon" -PR = "r1" +PR = "r2" SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/${PN}-${PV}.tar.gz \ - file://fix_build_issue_for_gcc_4.5.0.patch \ - file://dso_linking_change_build_fix.patch " + file://fix_build_issue_for_gcc_4.5.0.patch " SRC_URI[md5sum] = "f4824d0a75bdeeef1e45cc88de7bb58a" SRC_URI[sha256sum] = "7fd459a9fd05be9faec60a9a21caa9a1e9fda03147d58d8c7c95f33582a738c5" |