X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fbootstrap;h=4d2b826a86fe2c823fccb6febcaf3a5e75a3db7e;hb=d0fca170ce1b4352a1ad19cbdbbd4d7c29d07dc2;hp=631ac57cb42247b891a1d94696367a9c2903674a;hpb=17fbcd4ed8605df087cfdf74681b1bf318353849;p=vlc diff --git a/contrib/bootstrap b/contrib/bootstrap index 631ac57cb4..4d2b826a86 100755 --- a/contrib/bootstrap +++ b/contrib/bootstrap @@ -27,8 +27,10 @@ usage() echo " --disable-FOO configure to not build package FOO" echo " --enable-FOO configure to build package FOO" echo " --disable-disc configure to not build optical discs packages" + echo " --disable-net configure to not build networking packages" 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" } BUILD= @@ -37,7 +39,9 @@ PREFIX= PKGS_ENABLE= PKGS_DISABLE= BUILD_ENCODERS="1" +BUILD_NETWORK="1" BUILD_DISCS="1" +GPL="1" if test ! -f "../../contrib/src/main.mak" then @@ -64,12 +68,18 @@ do --disable-disc) BUILD_DISCS= ;; + --disable-net) + BUILD_NETWORK= + ;; --disable-sout) BUILD_ENCODERS= ;; --enable-small) ENABLE_SMALL=1 ;; + --disable-gpl) + GPL= + ;; --disable-*) PKGS_DISABLE="${PKGS_DISABLE} ${1#--disable-}" ;; @@ -88,7 +98,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 @@ -113,7 +123,7 @@ fi # Prepare files # echo "Creating configuration file... config.mak" -exec 3>config.mak +exec 3>config.mak || exit $? cat >&3 << EOF # This file was automatically generated. # Any change will be overwritten if ../bootstrap is run again. @@ -141,9 +151,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.6" && OSX_VERSION=10.6 + 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 @@ -156,6 +188,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 @@ -163,40 +201,31 @@ check_macosx_sdk() exit 1 fi + add_make "MACOSX_SDK=${SDKROOT}" add_make "OSX_VERSION ?= ${OSX_VERSION}" } -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 "SDKROOT=${SDKROOT}" -} - check_android_sdk() { [ -z "${ANDROID_NDK}" ] && echo "You must set ANDROID_NDK environment variable" && exit 1 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}" - test -z "${NO_NEON}" && add_make_enabled "HAVE_NEON" + [ -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" } test -z "$PREFIX" || add_make "PREFIX := $PREFIX" test -z "$BUILD_DISCS" || add_make_enabled "BUILD_DISCS" 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" # # Checks @@ -210,7 +239,13 @@ 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" + 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*) @@ -223,9 +258,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" ;; @@ -234,19 +275,19 @@ 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 # # Results output # test -e Makefile && unlink Makefile -ln -sf ../../contrib/src/main.mak Makefile +ln -sf ../../contrib/src/main.mak Makefile || exit $? cat << EOF Bootstrap completed. @@ -264,4 +305,4 @@ Other targets: * make package prepare prebuilt packages EOF -mkdir -p ../../contrib/tarballs +mkdir -p ../../contrib/tarballs || exit $?