summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2008-01-30 21:20:59 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2008-01-30 21:20:59 +0000
commitca9794b3b08c338da0d14d826c70439e991e5cdd (patch)
tree255cdf8698f7deccca3b41fabaa180235891b7c7
parentf7ee69e647236ed16393816c5cc1d8e5642c74e7 (diff)
downloadopenembedded-core-ca9794b3b08c338da0d14d826c70439e991e5cdd.tar.gz
openembedded-core-ca9794b3b08c338da0d14d826c70439e991e5cdd.tar.bz2
openembedded-core-ca9794b3b08c338da0d14d826c70439e991e5cdd.tar.xz
openembedded-core-ca9794b3b08c338da0d14d826c70439e991e5cdd.zip
flac: merge with OE (PowerPC only related)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3641 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/flac/flac_1.1.2.bb7
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/packages/flac/flac_1.1.2.bb b/meta/packages/flac/flac_1.1.2.bb
index 293455f2e..85ffc9beb 100644
--- a/meta/packages/flac/flac_1.1.2.bb
+++ b/meta/packages/flac/flac_1.1.2.bb
@@ -7,7 +7,7 @@ PR = "r5"
SRC_URI = "${SOURCEFORGE_MIRROR}/flac/flac-${PV}.tar.gz \
file://disable-xmms-plugin.patch;patch=1 \
file://xmms.m4"
-
+
S = "${WORKDIR}/flac-${PV}"
inherit autotools
@@ -31,6 +31,9 @@ do_configure () {
install -d ${S}/m4
install -m 0644 ${WORKDIR}/xmms.m4 ${S}/m4/
autotools_do_configure
+ # removes '-read-only-relocs' which is enabled for PowerPC builds.
+ # It makes the build fail, other archs are not affected. Fixes #1775.
+ sed -i 's/-Wl,-read_only_relocs,warning//g' src/libFLAC/Makefile
}
do_stage () {
@@ -39,7 +42,7 @@ do_stage () {
oe_libinstall -a -so -C src/libOggFLAC libOggFLAC ${STAGING_LIBDIR}/
install -d ${STAGING_INCDIR}/OggFLAC
install -m 0644 ${S}/include/OggFLAC/export.h ${STAGING_INCDIR}/OggFLAC/export.h
-
+
install -m 0644 ${S}/include/OggFLAC/all.h ${STAGING_INCDIR}/OggFLAC/all.h
install -m 0644 ${S}/include/OggFLAC/stream_encoder.h ${STAGING_INCDIR}/OggFLAC/stream_encoder.h
install -m 0644 ${S}/include/OggFLAC/stream_decoder.h ${STAGING_INCDIR}/OggFLAC/stream_decoder.h