libmusicbrainz: Add version 3.0.2 and fix link error

With gcc 4.3 stdc++ symbols leak into the library. One way to
solve it is to use a custom linker script, another one is to
just point gcc to the c++ library. The second option is used
here right now.

3 files changed, 21 insertions, 16 deletions

diff --git a/recipes/musicbrainz/libmusicbrainz.inc b/recipes/musicbrainz/libmusicbrainz.inc
new file mode 100644
index 0000000000..64a7f50794
--- /dev/null
+++ b/recipes/musicbrainz/libmusicbrainz.inc
@@ -0,0 +1,19 @@
+DEFAULT_PREFERENCE = "-1"
+
+DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
+It allows you to access the data held on the MusicBrainz server."
+HOMEPAGE = "http://musicbrainz.org"
+LICENSE = "LGPL"
+DEPENDS = "expat neon"
+
+SRC_URI = "ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
+
+inherit cmake pkgconfig
+
+# Fight a compiler/link bug that leaks too many c++ symbols
+TARGET_LDFLAGS += " -Wl,-rpath-link,${CROSS_DIR}/${TARGET_SYS}/lib "
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.1.bb b/recipes/musicbrainz/libmusicbrainz_3.0.1.bb
index e01695eb3d..bd54419686 100644
--- a/recipes/musicbrainz/libmusicbrainz_3.0.1.bb
+++ b/recipes/musicbrainz/libmusicbrainz_3.0.1.bb
@@ -1,16 +1 @@
-DEFAULT_PREFERENCE = "-1"
-
-DESCRIPTION = "The MusicBrainz client is a library which can be built into other programs. \
-It allows you to access the data held on the MusicBrainz server."
-HOMEPAGE = "http://musicbrainz.org"
-LICENSE = "LGPL"
-DEPENDS = "expat neon"
-
-SRC_URI = "http://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz"
-
-inherit cmake pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
-
+require ${PN}.inc
diff --git a/recipes/musicbrainz/libmusicbrainz_3.0.2.bb b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
new file mode 100644
index 0000000000..bd54419686
--- /dev/null
+++ b/recipes/musicbrainz/libmusicbrainz_3.0.2.bb
@@ -0,0 +1 @@
+require ${PN}.inc