Commit 1202fbfc authored by Felix Paul Kühne's avatar Felix Paul Kühne

MobileVLCKit/patches: fix application of patch 12

parent 64bfe3f8
From d4e40b7c448dd9857bdf3cbf11431a159821fb86 Mon Sep 17 00:00:00 2001
From 003d852f4014fcfcc771c333342f1b54b69fd47b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <fkuehne@videolan.org>
Date: Thu, 3 Oct 2013 18:27:43 +0200
Subject: [PATCH 12/21] contrib: add arch option for platforms where the arch
Subject: [PATCH 12/23] contrib: add arch option for platforms where the arch
triplet would be ambigous
---
......@@ -9,7 +9,7 @@ Subject: [PATCH 12/21] contrib: add arch option for platforms where the arch
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index e5c7022..cc170a2 100755
index 5e5f935..bddb1a8 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -30,6 +30,7 @@ usage()
......@@ -38,7 +38,7 @@ index e5c7022..cc170a2 100755
*)
echo "Unrecognized options $1"
usage
@@ -188,6 +193,7 @@ test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
@@ -206,6 +211,7 @@ test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS"
test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
test -z "$GPL" || add_make_enabled "GPL"
......@@ -46,12 +46,12 @@ index e5c7022..cc170a2 100755
#
# Checks
@@ -200,7 +206,10 @@ case "${OS}" in
check_macosx_sdk
@@ -219,7 +225,10 @@ case "${OS}" in
add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
else
check_ios_sdk
- add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+ add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
+ add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON"
+ if [ "$ARCH" != "arm64" ]; then
+ add_make_enabled "HAVE_ARMV7A"
+ fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment