diff options
author | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-22 19:07:39 +0100 |
---|---|---|
committer | Waldemar Brodkorb <mail@waldemar-brodkorb.de> | 2014-01-22 19:07:39 +0100 |
commit | c7b25f4c5726394f2cc57b924bb7913a3882255e (patch) | |
tree | 9381536c95c3e687744e5b1d9f00d325635b78b0 /package/libx264/patches/patch-configure | |
parent | 8e0a610b3e81f2a7b8e21ca3f40d0fe3c9ba941b (diff) | |
parent | af83cebd0f23c2ede05ed381ec69b3d9046dbd64 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/libx264/patches/patch-configure')
-rw-r--r-- | package/libx264/patches/patch-configure | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/package/libx264/patches/patch-configure b/package/libx264/patches/patch-configure index dd0097aeb..3fdcd36fd 100644 --- a/package/libx264/patches/patch-configure +++ b/package/libx264/patches/patch-configure @@ -1,6 +1,6 @@ ---- libx264-1.0.orig/configure 2013-10-10 22:45:04.000000000 +0200 -+++ libx264-1.0/configure 2013-10-12 17:49:39.000000000 +0200 -@@ -985,9 +985,9 @@ if [ "$debug" = "yes" ]; then +--- libx264-1.0.1.orig/configure 2014-01-22 11:20:21.000000000 +0100 ++++ libx264-1.0.1/configure 2014-01-22 11:29:13.000000000 +0100 +@@ -1007,9 +1007,9 @@ if [ "$debug" = "yes" ]; then elif [ $ARCH = ARM ]; then # arm-gcc-4.2 produces incorrect output with -ffast-math # and it doesn't save any speed anyway on 4.4, so disable it @@ -12,7 +12,7 @@ fi if cc_check '' -fno-tree-vectorize ; then -@@ -1125,6 +1125,7 @@ bindir=$bindir +@@ -1147,6 +1147,7 @@ bindir=$bindir libdir=$libdir includedir=$includedir ARCH=$ARCH @@ -20,12 +20,3 @@ SYS=$SYS CC=$CC CFLAGS=$CFLAGS -@@ -1136,7 +1137,7 @@ LIBX264=$LIBX264 - AR=$AR - RANLIB=$RANLIB - STRIP=$STRIP --AS=$AS -+AS=$CC - ASFLAGS=$ASFLAGS - RC=$RC - RCFLAGS=$RCFLAGS |