Contrib: allow building contribs with no optimization

[vlc] / contrib / bootstrap

diff --git a/contrib/bootstrap b/contrib/bootstrap
index f0bfe917f754163fab4b783895cfa1a3aaa36d13..ced4fe081abf184588999266723edbeaa591c5db 100755 (executable)
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -31,6 +31,7 @@ usage()
        echo "  --disable-sout   configure to not build stream output packages"
        echo "  --enable-small   optimize libraries for size with slight speed decrease [DANGEROUS]"
        echo "  --disable-gpl    configure to not build viral GPL code"
+       echo "  --disable-optim  disable optimization in libraries"
 }
 
 BUILD=
@@ -42,6 +43,7 @@ BUILD_ENCODERS="1"
 BUILD_NETWORK="1"
 BUILD_DISCS="1"
 GPL="1"
+WITH_OPTIMIZATION="1"
 
 if test ! -f "../../contrib/src/main.mak"
 then
@@ -74,6 +76,9 @@ do
                --disable-sout)
                        BUILD_ENCODERS=
                        ;;
+               --disable-optim)
+                       WITH_OPTIMIZATION=
+                       ;;
                --enable-small)
                        ENABLE_SMALL=1
                        ;;
@@ -98,7 +103,7 @@ done
 if test -z "$BUILD"
 then
        echo -n "Guessing build system... "
-       BUILD="`cc -dumpmachine`"
+       BUILD="`${CC:-cc} -dumpmachine`"
        if test -z "$BUILD"; then
                echo "FAIL!"
                exit 1
@@ -151,9 +156,31 @@ add_make_enabled()
        done
 }
 
+check_ios_sdk()
+{
+   if test -z "$SDKROOT"
+   then
+      SDKROOT=`xcode-select -print-path`/Platforms/iPhone${PLATFORM}.platform/Developer/SDKs/iPhone${PLATFORM}${SDK_VERSION}.sdk
+      echo "SDKROOT not specified, assuming $SDKROOT"
+   else
+      SDKROOT="$SDKROOT"
+      fi
+
+   if [ ! -d "${SDKROOT}" ]
+   then
+      echo "*** ${SDKROOT} does not exist, please install required SDK, or set SDKROOT manually. ***"
+      exit 1
+   fi
+   add_make "IOS_SDK=${SDKROOT}"
+}
+
 check_macosx_sdk()
 {
-   [ -z "${OSX_VERSION}" ] && echo "OSX_VERSION not specified, assuming 10.7" && OSX_VERSION=10.7
+   if [ -z "${OSX_VERSION}" ]
+   then
+      OSX_VERSION=`xcrun --show-sdk-version`
+      echo "OSX_VERSION not specified, assuming $OSX_VERSION"
+   fi
    if test -z "$SDKROOT"
    then
       SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
@@ -166,6 +193,12 @@ check_macosx_sdk()
       SDKROOT=`xcode-select -print-path`/SDKs/MacOSX$OSX_VERSION.sdk
       echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
    fi
+   if [ ! -d "${SDKROOT}" ]
+   then
+      SDKROOT_NOT_FOUND="$SDKROOT"
+      SDKROOT=`xcrun --show-sdk-path`
+      echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
+   fi
 
    if [ ! -d "${SDKROOT}" ]
    then
@@ -183,8 +216,12 @@ check_android_sdk()
        add_make "ANDROID_NDK := ${ANDROID_NDK}"
        [ -z "${ANDROID_ABI}" ] && echo "You must set ANDROID_ABI environment variable" && exit 1
        add_make "ANDROID_ABI := ${ANDROID_ABI}"
+       [ -z "${ANDROID_API}" ] && echo "You should set ANDROID_API environment variable (using default android-9)" && ANDROID_API := android-9
+       add_make "ANDROID_API := ${ANDROID_API}"
        [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_NEON"
        [ ${ANDROID_ABI} = "armeabi-v7a" ] && add_make_enabled "HAVE_ARMV7A"
+       [ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_NEON"
+       [ ${ANDROID_ABI} = "arm64-v8a" ] && add_make_enabled "HAVE_ARMV8A"
        [ ${ANDROID_ABI} = "armeabi" -a -z "${NO_ARMV6}" ] && add_make_enabled "HAVE_ARMV6"
 }
 
@@ -194,6 +231,7 @@ test -z "$BUILD_ENCODERS" || add_make_enabled "BUILD_ENCODERS"
 test -z "$BUILD_NETWORK" || add_make_enabled "BUILD_NETWORK"
 test -z "$ENABLE_SMALL" || add_make_enabled "ENABLE_SMALL"
 test -z "$GPL" || add_make_enabled "GPL"
+test -z "$WITH_OPTIMIZATION" || add_make_enabled "WITH_OPTIMIZATION"
 
 #
 # Checks
@@ -206,7 +244,14 @@ case "${OS}" in
                        check_macosx_sdk
                        add_make_enabled "HAVE_MACOSX" "HAVE_DARWIN_OS" "HAVE_BSD"
                else
-                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_NEON" "HAVE_ARMV7A"
+                       check_ios_sdk
+                       add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
+
+                       case "${HOST}" in
+                               *arm*)
+                               add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
+                               ;;
+                       esac;
                fi
                ;;
        *bsd*)
@@ -219,9 +264,15 @@ case "${OS}" in
                        *arm*)
                        add_make "PLATFORM_SHORT_ARCH := arm"
                        ;;
+                       *arm64*|*aarch64*)
+                       add_make "PLATFORM_SHORT_ARCH := arm64"
+                       ;;
                        *i686*)
                        add_make "PLATFORM_SHORT_ARCH := x86"
                        ;;
+                       *x86_64*)
+                       add_make "PLATFORM_SHORT_ARCH := x86_64"
+                       ;;
                        *mipsel*)
                        add_make "PLATFORM_SHORT_ARCH := mips"
                        ;;
@@ -230,12 +281,12 @@ case "${OS}" in
        *linux*)
                add_make_enabled "HAVE_LINUX"
                ;;
-       *wince*)
-               add_make_enabled "HAVE_WINCE"
-               ;;
        *mingw*)
                add_make_enabled "HAVE_WIN32"
                ;;
+       *solaris*)
+               add_make_enabled "HAVE_SOLARIS"
+               ;;
 esac
 
 #