Revert "libvpx: Pull from upstream"

source/libvpx/build/make/configure.sh

 #!/bin/sh
 ##
 ##  configure.sh
 ##
 ##  This script is sourced by the main configure script and contains
 ##  utility functions and other common bits that aren't strictly libvpx
 ##  related.
 ##
 ##  This build system is based in part on the FFmpeg configure script.
 ##
@@ skipping 183 matching lines @@
   eval test "x\$$1" = "xyes"
 }
 
 disabled(){
   eval test "x\$$1" = "xno"
 }
 
 soft_enable() {
   for var in $*; do
     if ! disabled $var; then
-      enabled $var || log_echo "  enabling $var"
+      log_echo "  enabling $var"
       enable_feature $var
     fi
   done
 }
 
 soft_disable() {
   for var in $*; do
     if ! enabled $var; then
-      disabled $var || log_echo "  disabling $var"
+      log_echo "  disabling $var"
       disable_feature $var
     fi
   done
 }
 
 #
 # Text Processing Functions
 #
 toupper(){
   echo "$@" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ
@@ skipping 277 matching lines @@
       --extra-cflags=*)
         extra_cflags="${optval}"
         ;;
       --enable-?*|--disable-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         if echo "${ARCH_EXT_LIST}" | grep "^ *$option\$" >/dev/null; then
           [ $action = "disable" ] && RTCD_OPTIONS="${RTCD_OPTIONS}--disable-${option} "
         elif [ $action = "disable" ] && ! disabled $option ; then
           echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||
             die_unknown $opt
-          log_echo "  disabling $option"
         elif [ $action = "enable" ] && ! enabled $option ; then
           echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||
             die_unknown $opt
-          log_echo "  enabling $option"
         fi
         ${action}_feature $option
         ;;
       --require-?*)
         eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`
         if echo "${ARCH_EXT_LIST}" none | grep "^ *$option\$" >/dev/null; then
             RTCD_OPTIONS="${RTCD_OPTIONS}${opt} "
         else
             die_unknown $opt
         fi
@@ skipping 75 matching lines @@
   CXX=${CXX:-${CROSS}g++}
   AR=${AR:-${CROSS}ar}
   LD=${LD:-${CROSS}${link_with_cc:-ld}}
   AS=${AS:-${CROSS}as}
   STRIP=${STRIP:-${CROSS}strip}
   NM=${NM:-${CROSS}nm}
   AS_SFX=.s
   EXE_SFX=
 }
 
-# Reliably find the newest available Darwin SDKs. (Older versions of
-# xcrun don't support --show-sdk-path.)
-show_darwin_sdk_path() {
-  xcrun --sdk $1 --show-sdk-path 2>/dev/null ||
-    xcodebuild -sdk $1 -version Path 2>/dev/null
-}
-
 process_common_toolchain() {
   if [ -z "$toolchain" ]; then
     gcctarget="${CHOST:-$(gcc -dumpmachine 2> /dev/null)}"
 
     # detect tgt_isa
     case "$gcctarget" in
       armv6*)
         tgt_isa=armv6
         ;;
       armv7*-hardfloat*)
@@ skipping 40 matching lines @@
         tgt_os=darwin11
         ;;
       *darwin12*)
         tgt_isa=x86_64
         tgt_os=darwin12
         ;;
       *darwin13*)
         tgt_isa=x86_64
         tgt_os=darwin13
         ;;
-      *darwin14*)
-        tgt_isa=x86_64
-        tgt_os=darwin14
-        ;;
       x86_64*mingw32*)
         tgt_os=win64
         ;;
       *mingw32*|*cygwin*)
         [ -z "$tgt_isa" ] && tgt_isa=x86
         tgt_os=win32
         ;;
       *linux*|*bsd*)
         tgt_os=linux
         ;;
@@ skipping 39 matching lines @@
       ;;
   esac
 
   # PIC is probably what we want when building shared libs
   enabled shared && soft_enable pic
 
   # Minimum iOS version for all target platforms (darwin and iphonesimulator).
   IOS_VERSION_MIN="6.0"
 
   # Handle darwin variants. Newer SDKs allow targeting older
-  # platforms, so use the newest one available.
+  # platforms, so find the newest SDK available.
   case ${toolchain} in
     *-darwin*)
-      osx_sdk_dir="$(show_darwin_sdk_path macosx)"
-      if [ -d "${osx_sdk_dir}" ]; then
-        add_cflags  "-isysroot ${osx_sdk_dir}"
-        add_ldflags "-isysroot ${osx_sdk_dir}"
+      if [ -z "${DEVELOPER_DIR}" ]; then
+        DEVELOPER_DIR=`xcode-select -print-path 2> /dev/null`
+        [ $? -ne 0 ] && OSX_SKIP_DIR_CHECK=1
+      fi
+      if [ -z "${OSX_SKIP_DIR_CHECK}" ]; then
+        OSX_SDK_ROOTS="${DEVELOPER_DIR}/SDKs"
+        OSX_SDK_VERSIONS="MacOSX10.4u.sdk MacOSX10.5.sdk MacOSX10.6.sdk"
+        OSX_SDK_VERSIONS="${OSX_SDK_VERSIONS} MacOSX10.7.sdk"
+        for v in ${OSX_SDK_VERSIONS}; do
+          if [ -d "${OSX_SDK_ROOTS}/${v}" ]; then
+            osx_sdk_dir="${OSX_SDK_ROOTS}/${v}"
+          fi
+        done
       fi
       ;;
   esac
 
+  if [ -d "${osx_sdk_dir}" ]; then
+    add_cflags  "-isysroot ${osx_sdk_dir}"
+    add_ldflags "-isysroot ${osx_sdk_dir}"
+  fi
+
   case ${toolchain} in
     *-darwin8-*)
       add_cflags  "-mmacosx-version-min=10.4"
       add_ldflags "-mmacosx-version-min=10.4"
       ;;
     *-darwin9-*)
       add_cflags  "-mmacosx-version-min=10.5"
       add_ldflags "-mmacosx-version-min=10.5"
       ;;
     *-darwin10-*)
       add_cflags  "-mmacosx-version-min=10.6"
       add_ldflags "-mmacosx-version-min=10.6"
       ;;
     *-darwin11-*)
       add_cflags  "-mmacosx-version-min=10.7"
       add_ldflags "-mmacosx-version-min=10.7"
       ;;
     *-darwin12-*)
       add_cflags  "-mmacosx-version-min=10.8"
       add_ldflags "-mmacosx-version-min=10.8"
       ;;
     *-darwin13-*)
       add_cflags  "-mmacosx-version-min=10.9"
       add_ldflags "-mmacosx-version-min=10.9"
       ;;
-    *-darwin14-*)
-      add_cflags  "-mmacosx-version-min=10.10"
-      add_ldflags "-mmacosx-version-min=10.10"
-      ;;
     *-iphonesimulator-*)
       add_cflags  "-miphoneos-version-min=${IOS_VERSION_MIN}"
       add_ldflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
-      iossim_sdk_dir="$(show_darwin_sdk_path iphonesimulator)"
-      if [ -d "${iossim_sdk_dir}" ]; then
-        add_cflags  "-isysroot ${iossim_sdk_dir}"
-        add_ldflags "-isysroot ${iossim_sdk_dir}"
-      fi
+      osx_sdk_dir="$(xcrun --sdk iphonesimulator --show-sdk-path)"
+      add_cflags  "-isysroot ${osx_sdk_dir}"
+      add_ldflags "-isysroot ${osx_sdk_dir}"
       ;;
   esac
 
   # Handle Solaris variants. Solaris 10 needs -lposix4
   case ${toolchain} in
     sparc-solaris-*)
       add_extralibs -lposix4
       disable_feature fast_unaligned
       ;;
     *-solaris-*)
@@ skipping 151 matching lines @@
           soft_enable realtime_only
           if [ ${tgt_isa} = "armv7" ]; then
             soft_enable runtime_cpu_detect
           fi
           if enabled runtime_cpu_detect; then
             add_cflags "-I${SDK_PATH}/sources/android/cpufeatures"
           fi
           ;;
 
         darwin*)
-          XCRUN_FIND="xcrun --sdk iphoneos --find"
+          XCRUN_FIND="xcrun --sdk iphoneos -find"
           CXX="$(${XCRUN_FIND} clang++)"
           CC="$(${XCRUN_FIND} clang)"
           AR="$(${XCRUN_FIND} ar)"
           AS="$(${XCRUN_FIND} as)"
           STRIP="$(${XCRUN_FIND} strip)"
           NM="$(${XCRUN_FIND} nm)"
           RANLIB="$(${XCRUN_FIND} ranlib)"
           AS_SFX=.s
 
           # Special handling of ld for armv6 because libclang_rt.ios.a does
           # not contain armv6 support in Apple's clang package:
           #   Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn).
           # TODO(tomfinegan): Remove this. Our minimum iOS version (6.0)
           # renders support for armv6 unnecessary because the 3GS and up
           # support neon.
           if [ "${tgt_isa}" = "armv6" ]; then
             LD="$(${XCRUN_FIND} ld)"
           else
             LD="${CXX:-$(${XCRUN_FIND} ld)}"
           fi
 
           # ASFLAGS is written here instead of using check_add_asflags
           # because we need to overwrite all of ASFLAGS and purge the
           # options that were put in above
           ASFLAGS="-arch ${tgt_isa} -g"
 
-          add_cflags -arch ${tgt_isa}
+          alt_libc="$(xcrun --sdk iphoneos --show-sdk-path)"
+          add_cflags -arch ${tgt_isa} -isysroot ${alt_libc}
           add_ldflags -arch ${tgt_isa}
 
-          alt_libc="$(show_darwin_sdk_path iphoneos)"
-          if [ -d "${alt_libc}" ]; then
-            add_cflags -isysroot ${alt_libc}
-          fi
-
           if [ "${LD}" = "${CXX}" ]; then
             add_ldflags -miphoneos-version-min="${IOS_VERSION_MIN}"
           else
             add_ldflags -ios_version_min "${IOS_VERSION_MIN}"
           fi
 
           for d in lib usr/lib usr/lib/system; do
             try_dir="${alt_libc}/${d}"
             [ -d "${try_dir}" ] && add_ldflags -L"${try_dir}"
           done
@@ skipping 147 matching lines @@
       check_gcc_machine_option sse3
       check_gcc_machine_option ssse3
       check_gcc_machine_option sse4 sse4_1
       check_gcc_machine_option avx
       check_gcc_machine_option avx2
 
       case "${AS}" in
         auto|"")
           which nasm >/dev/null 2>&1 && AS=nasm
           which yasm >/dev/null 2>&1 && AS=yasm
-          if [ "${AS}" = nasm ] ; then
-            # Apple ships version 0.98 of nasm through at least Xcode 6. Revisit
-            # this check if they start shipping a compatible version.
-            apple=`nasm -v | grep "Apple"`
-            [ -n "${apple}" ] \
-              && echo "Unsupported version of nasm: ${apple}" \
-              && AS=""
-          fi
           [ "${AS}" = auto ] || [ -z "${AS}" ] \
             && die "Neither yasm nor nasm have been found"
           ;;
       esac
       log_echo "  using $AS"
       [ "${AS##*/}" = nasm ] && add_asflags -Ox
       AS_SFX=.asm
       case  ${tgt_os} in
         win32)
           add_asflags -f win32
@@ skipping 73 matching lines @@
 
   if enabled optimizations; then
     if enabled rvct; then
       enabled small && check_add_cflags -Ospace || check_add_cflags -Otime
     else
       enabled small && check_add_cflags -O2 ||  check_add_cflags -O3
     fi
   fi
 
   tgt_os_no_version=$(echo "${tgt_os}" | tr -d "[0-9]")
-  if [ "${tgt_os_no_version}" = "openbsd" ] || [ "`uname`" = "OpenBSD" ]; then
-    openbsd_like=yes
-  fi
   # Default use_x86inc to yes when we are 64 bit, non-pic, or on any
   # non-Darwin target.
   if [ "${tgt_isa}" = "x86_64" ] || [ "${pic}" != "yes" ] || \
-      [ "${openbsd_like}" != "yes" ]; then
+      [ "${tgt_os_no_version}" != "darwin" ]; then
     soft_enable use_x86inc
   fi
 
   # Position Independent Code (PIC) support, for building relocatable
   # shared objects
   enabled gcc && enabled pic && check_add_cflags -fPIC
 
   # Work around longjmp interception on glibc >= 2.11, to improve binary
   # compatibility. See http://code.google.com/p/webm/issues/detail?id=166
   enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
@@ skipping 143 matching lines @@
   # Prepare the PWD for building.
   for f in ${OOT_INSTALLS}; do
     install -D "${source_path}/$f" "$f"
   done
   fi
   cp "${source_path}/build/make/Makefile" .
 
   clean_temp_files
   true
 }