summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-09-13 19:23:36 +0300
committerLuis de Bethencourt <luis.bg@samsung.com>2014-11-07 10:34:20 +0000
commitc8b181f2f50fed55c4367b872127ffdc2abd0f79 (patch)
tree5cdfbaf21582e3b32cf433c37667fd925568bf1d
parent2da32e4cb3e09707b3b1b4d03a13de9b46cbcef8 (diff)
libtheora: Don't use --force-addr on iOS, it does not work with newer clang
-rw-r--r--recipes/libtheora.recipe1
-rw-r--r--recipes/libtheora/0007-Don-t-use-fforce-addr.patch40
2 files changed, 41 insertions, 0 deletions
diff --git a/recipes/libtheora.recipe b/recipes/libtheora.recipe
index 9d77fcf9..ee244319 100644
--- a/recipes/libtheora.recipe
+++ b/recipes/libtheora.recipe
@@ -30,5 +30,6 @@ class Recipe(recipe.Recipe):
self.config_sh = 'sh autogen.sh'
elif self.config.target_platform == Platform.IOS:
self.configure_options = ' --disable-spec --disable-doc'
+ self.patches += 'libtheora/0007-Don-t-use-fforce-addr.patch'
elif self.config.target_arch != self.config.arch:
self.configure_options = ' --disable-spec --disable-doc --disable-examples'
diff --git a/recipes/libtheora/0007-Don-t-use-fforce-addr.patch b/recipes/libtheora/0007-Don-t-use-fforce-addr.patch
new file mode 100644
index 00000000..1effdb7a
--- /dev/null
+++ b/recipes/libtheora/0007-Don-t-use-fforce-addr.patch
@@ -0,0 +1,40 @@
+From 971ff618f3bb02a3d4eeba97922db37776a8fa0e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Sat, 13 Sep 2014 18:19:23 +0200
+Subject: [PATCH] Don't use -fforce-addr
+
+It does not work with newer clang.
+---
+ configure | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 2864b4e..5e41a0d 100755
+--- a/configure
++++ b/configure
+@@ -11895,7 +11895,7 @@ else
+ case $host in
+ *)
+ DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ esac
+ fi
+diff --git a/configure.ac b/configure.ac
+index f4918a4..f4cf2a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,7 +168,7 @@ else
+ case $host in
+ *)
+ DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
+- CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
++ CFLAGS="-Wall -Wno-parentheses -O3 -fomit-frame-pointer -finline-functions -funroll-loops"
+ PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
+ esac
+ fi
+--
+1.9.3 (Apple Git-50)
+