summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2014-09-13 21:11:54 +0300
committerLuis de Bethencourt <luis.bg@samsung.com>2014-11-07 15:37:00 +0000
commitd061408e8dc5bbb101dba2cf3ae8c2fec009e755 (patch)
treedb9bca8a7c6265c9bcb44e8b9a1a1d3ddb82a393
parent91d9324fba1d06261a97b1db852031fce0cb75f8 (diff)
x264: Don't use -falign-loops with clang on Darwin, it does not exist
-rw-r--r--recipes/x264.recipe1
-rw-r--r--recipes/x264/0001-Don-t-use-falign-loops-with-clang-it-does-not-exist.patch24
2 files changed, 25 insertions, 0 deletions
diff --git a/recipes/x264.recipe b/recipes/x264.recipe
index fa38d7ed..069715e7 100644
--- a/recipes/x264.recipe
+++ b/recipes/x264.recipe
@@ -14,6 +14,7 @@ class Recipe(recipe.Recipe):
url = 'http://download.videolan.org/pub/x264/snapshots/x264-snapshot-20140212-2245-stable.tar.bz2'
tarball_dirname= 'x264-snapshot-20140212-2245-stable'
new_env = {'AS': 'yasm'}
+ patches = ['x264/0001-Don-t-use-falign-loops-with-clang-it-does-not-exist.patch']
files_libs = ['libx264']
files_bins = ['x264']
diff --git a/recipes/x264/0001-Don-t-use-falign-loops-with-clang-it-does-not-exist.patch b/recipes/x264/0001-Don-t-use-falign-loops-with-clang-it-does-not-exist.patch
new file mode 100644
index 00000000..dae8de0f
--- /dev/null
+++ b/recipes/x264/0001-Don-t-use-falign-loops-with-clang-it-does-not-exist.patch
@@ -0,0 +1,24 @@
+From 50d5d6a4156902c986d9d60e92f9e211ff5408c0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
+Date: Sat, 13 Sep 2014 20:10:15 +0200
+Subject: [PATCH] Don't use -falign-loops with clang, it does not exist
+
+---
+ configure | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/configure b/configure
+index 0177cfc..d5869a5 100755
+--- a/configure
++++ b/configure
+@@ -467,7 +467,6 @@ case $host_os in
+ ;;
+ darwin*)
+ SYS="MACOSX"
+- CFLAGS="$CFLAGS -falign-loops=16"
+ libm="-lm"
+ if [ "$pic" = "no" ]; then
+ cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"
+--
+1.9.3 (Apple Git-50)
+