diff options
Diffstat (limited to 'multimedia/libvpx/files/patch-build_make_configure.sh')
| -rw-r--r-- | multimedia/libvpx/files/patch-build_make_configure.sh | 43 |
1 files changed, 15 insertions, 28 deletions
diff --git a/multimedia/libvpx/files/patch-build_make_configure.sh b/multimedia/libvpx/files/patch-build_make_configure.sh index 3744618cef45..6f6705559b47 100644 --- a/multimedia/libvpx/files/patch-build_make_configure.sh +++ b/multimedia/libvpx/files/patch-build_make_configure.sh @@ -1,31 +1,18 @@ ---- build/make/configure.sh.orig 2014-11-27 18:00:48 UTC +--- build/make/configure.sh.orig 2015-04-03 18:49:19 UTC +++ build/make/configure.sh -@@ -799,7 +799,6 @@ process_common_toolchain() { +@@ -379,6 +379,7 @@ write_common_config_banner() { + print_webm_license config.mk "##" "" + echo '# This file automatically generated by configure. Do not edit!' >> config.mk + echo "TOOLCHAIN := ${toolchain}" >> config.mk ++ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk - case ${tgt_cc} in - gcc) -- CROSS=${CROSS:-arm-none-linux-gnueabi-} - link_with_cc=gcc - setup_gnu_toolchain - arch_int=${tgt_isa##armv} -$FreeBSD$ - ---- build/make/configure.sh.orig 2014-12-03 18:11:14.000000000 +0100 -+++ build/make/configure.sh 2014-12-03 20:20:00.000000000 +0100 -@@ -382,6 +382,7 @@ - print_webm_license config.mk "##" "" - echo '# This file automatically generated by configure. Do not edit!' >> config.mk - echo "TOOLCHAIN := ${toolchain}" >> config.mk -+ echo "CLANG_NO_IAS=${CLANG_NO_IAS}" >> config.mk + case ${toolchain} in + *-linux-rvct) +@@ -831,7 +832,6 @@ process_common_toolchain() { - case ${toolchain} in - *-linux-rvct) -@@ -1019,7 +1019,7 @@ EOF - bits=32 - enabled x86_64 && bits=64 - check_cpp <<EOF && bits=x32 --#ifndef __ILP32__ -+#if !defined(__ILP32__) || !defined(__x86_64__) - #error "not x32" - #endif - EOF + case ${tgt_cc} in + gcc) +- CROSS=${CROSS:-arm-none-linux-gnueabi-} + link_with_cc=gcc + setup_gnu_toolchain + arch_int=${tgt_isa##armv} |