summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-07-11 08:24:30 +0000
committerKoen Kooi <koen@openembedded.org>2008-07-11 08:24:30 +0000
commita7b535066025fea712e253cd0951f244ec4bbaf8 (patch)
tree38d3873e90cdc87130f818b741d996307ac532b4
parentd8805be5cae986e4489bb7a9a83836bd133c1615 (diff)
libmad: sanitize optimization options, some were remove in recent gcc versions
-rw-r--r--packages/libmad/files/mad.diff24
-rw-r--r--packages/libmad/libmad_0.15.1b.bb5
2 files changed, 27 insertions, 2 deletions
diff --git a/packages/libmad/files/mad.diff b/packages/libmad/files/mad.diff
new file mode 100644
index 0000000000..851dc01201
--- /dev/null
+++ b/packages/libmad/files/mad.diff
@@ -0,0 +1,24 @@
+--- /tmp/configure.ac 2008-07-11 10:19:17.000000000 +0200
++++ libmad-0.15.1b/configure.ac 2008-07-11 10:20:00.313198000 +0200
+@@ -140,21 +140,14 @@
+ case "$optimize" in
+ -O|"-O "*)
+ optimize="-O"
+- optimize="$optimize -fforce-mem"
+- optimize="$optimize -fforce-addr"
+ : #x optimize="$optimize -finline-functions"
+ : #- optimize="$optimize -fstrength-reduce"
+- optimize="$optimize -fthread-jumps"
+- optimize="$optimize -fcse-follow-jumps"
+- optimize="$optimize -fcse-skip-blocks"
+ : #x optimize="$optimize -frerun-cse-after-loop"
+ : #x optimize="$optimize -frerun-loop-opt"
+ : #x optimize="$optimize -fgcse"
+ optimize="$optimize -fexpensive-optimizations"
+- optimize="$optimize -fregmove"
+ : #* optimize="$optimize -fdelayed-branch"
+ : #x optimize="$optimize -fschedule-insns"
+- optimize="$optimize -fschedule-insns2"
+ : #? optimize="$optimize -ffunction-sections"
+ : #? optimize="$optimize -fcaller-saves"
+ : #> optimize="$optimize -funroll-loops"
diff --git a/packages/libmad/libmad_0.15.1b.bb b/packages/libmad/libmad_0.15.1b.bb
index d828ca85a4..4a75c2d927 100644
--- a/packages/libmad/libmad_0.15.1b.bb
+++ b/packages/libmad/libmad_0.15.1b.bb
@@ -3,10 +3,11 @@ SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "libid3tag"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "${SOURCEFORGE_MIRROR}/mad/libmad-${PV}.tar.gz \
- file://add-pkgconfig.patch;patch=1"
+ file://add-pkgconfig.patch;patch=1 \
+ file://mad.diff;patch=1 "
S = "${WORKDIR}/libmad-${PV}"