source/libvpx/build/make/configure.sh - Issue 23600008: libvpx: Pull from upstream

Unified Diff: source/libvpx/build/make/configure.sh

Issue 23600008: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: source/libvpx/build/make/configure.sh

===================================================================

--- source/libvpx/build/make/configure.sh (revision 219822)

+++ source/libvpx/build/make/configure.sh (working copy)

@@ -1,4 +1,4 @@

-#!/bin/bash

+#!/bin/sh

## configure.sh

@@ -198,11 +198,11 @@

# Boolean Manipulation Functions

-enable(){

+enable_feature(){

set_all yes $*

}

-disable(){

+disable_feature(){

set_all no $*

}

@@ -219,7 +219,7 @@

for var in $*; do

if ! disabled $var; then

log_echo " enabling $var"

- enable $var

+ enable_feature $var

done

}

@@ -228,7 +228,7 @@

for var in $*; do

if ! enabled $var; then

log_echo " disabling $var"

- disable $var

+ disable_feature $var

done

}

@@ -251,10 +251,10 @@

# Temporary File Functions

source_path=${0%/*}

-enable source_path_used

+enable_feature source_path_used

if test -z "$source_path" -o "$source_path" = "." ; then

source_path="`pwd`"

- disable source_path_used

+ disable_feature source_path_used

if test ! -z "$TMPDIR" ; then

@@ -264,12 +264,13 @@

else

TMPDIRx="/tmp"

-TMP_H="${TMPDIRx}/vpx-conf-$$-${RANDOM}.h"

-TMP_C="${TMPDIRx}/vpx-conf-$$-${RANDOM}.c"

-TMP_CC="${TMPDIRx}/vpx-conf-$$-${RANDOM}.cc"

-TMP_O="${TMPDIRx}/vpx-conf-$$-${RANDOM}.o"

-TMP_X="${TMPDIRx}/vpx-conf-$$-${RANDOM}.x"

-TMP_ASM="${TMPDIRx}/vpx-conf-$$-${RANDOM}.asm"

+RAND=$(awk 'BEGIN { srand(); printf "%d\n",(rand() * 32768)}')

+TMP_H="${TMPDIRx}/vpx-conf-$$-${RAND}.h"

+TMP_C="${TMPDIRx}/vpx-conf-$$-${RAND}.c"

+TMP_CC="${TMPDIRx}/vpx-conf-$$-${RAND}.cc"

+TMP_O="${TMPDIRx}/vpx-conf-$$-${RAND}.o"

+TMP_X="${TMPDIRx}/vpx-conf-$$-${RAND}.x"

+TMP_ASM="${TMPDIRx}/vpx-conf-$$-${RAND}.asm"

clean_temp_files() {

rm -f ${TMP_C} ${TMP_CC} ${TMP_H} ${TMP_O} ${TMP_X} ${TMP_ASM}

@@ -316,8 +317,8 @@

header=$1

shift

var=`echo $header | sed 's/[^A-Za-z0-9_]/_/g'`

- disable $var

- check_cpp "$@" <<EOF && enable $var

+ disable_feature $var

+ check_cpp "$@" <<EOF && enable_feature $var

#include "$header"

int x;

EOF

@@ -479,7 +480,7 @@

for opt in "$@"; do

optval="${opt#*=}"

case "$opt" in

- --child) enable child

+ --child) enable_feature child

;;

--log*)

logging="$optval"

@@ -491,7 +492,7 @@

;;

--target=*) toolchain="${toolchain:-${optval}}"

;;

- --force-target=*) toolchain="${toolchain:-${optval}}"; enable force_toolchain

+ --force-target=*) toolchain="${toolchain:-${optval}}"; enable_feature force_toolchain

;;

--cpu)

;;

@@ -511,7 +512,7 @@

echo "${CMDLINE_SELECT}" | grep "^ *$option\$" >/dev/null ||

die_unknown $opt

- $action $option

+ ${action}_feature $option

;;

--require-?*)

eval `echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g'`

@@ -523,11 +524,11 @@

;;

--force-enable-?*|--force-disable-?*)

eval `echo "$opt" | sed 's/--force-/action=/;s/-/ option=/;s/-/_/g'`

- $action $option

+ ${action}_feature $option

;;

--libc=*)

[ -d "${optval}" ] || die "Not a directory: ${optval}"

- disable builtin_libc

+ disable_feature builtin_libc

alt_libc="${optval}"

;;

--as=*)

@@ -696,13 +697,13 @@

# Mark the specific ISA requested as enabled

soft_enable ${tgt_isa}

- enable ${tgt_os}

- enable ${tgt_cc}

+ enable_feature ${tgt_os}

+ enable_feature ${tgt_cc}

# Enable the architecture family

case ${tgt_isa} in

- arm*) enable arm;;

- mips*) enable mips;;

+ arm*) enable_feature arm;;

+ mips*) enable_feature mips;;

esac

# PIC is probably what we want when building shared libs

@@ -765,7 +766,7 @@

case ${toolchain} in

sparc-solaris-*)

add_extralibs -lposix4

- disable fast_unaligned

+ disable_feature fast_unaligned

;;

*-solaris-*)

add_extralibs -lposix4

@@ -790,7 +791,7 @@

;;

armv5te)

soft_enable edsp

- disable fast_unaligned

+ disable_feature fast_unaligned

;;

esac

@@ -805,7 +806,7 @@

arch_int=${arch_int%%te}

check_add_asflags --defsym ARCHITECTURE=${arch_int}

tune_cflags="-mtune="

- if [ ${tgt_isa} == "armv7" ]; then

+ if [ ${tgt_isa} = "armv7" ]; then

if [ -z "${float_abi}" ]; then

check_cpp <<EOF && float_abi=hard || float_abi=softfp

#ifndef __ARM_PCS_VFP

@@ -842,8 +843,8 @@

asm_conversion_cmd="${source_path}/build/make/ads2armasm_ms.pl"

AS_SFX=.s

msvs_arch_dir=arm-msvs

- disable multithread

- disable unit_tests

+ disable_feature multithread

+ disable_feature unit_tests

;;

rvct)

CC=armcc

@@ -855,7 +856,7 @@

tune_cflags="--cpu="

tune_asflags="--cpu="

if [ -z "${tune_cpu}" ]; then

- if [ ${tgt_isa} == "armv7" ]; then

+ if [ ${tgt_isa} = "armv7" ]; then

if enabled neon

then

check_add_cflags --fpu=softvfp+vfpv3

@@ -880,8 +881,8 @@

case ${tgt_os} in

none*)

- disable multithread

- disable os_support

+ disable_feature multithread

+ disable_feature os_support

;;

android*)

@@ -913,9 +914,9 @@

# Cortex-A8 implementations (NDK Dev Guide)

add_ldflags "-Wl,--fix-cortex-a8"

- enable pic

+ enable_feature pic

soft_enable realtime_only

- if [ ${tgt_isa} == "armv7" ]; then

+ if [ ${tgt_isa} = "armv7" ]; then

soft_enable runtime_cpu_detect

if enabled runtime_cpu_detect; then

@@ -969,7 +970,7 @@

;;

linux*)

- enable linux

+ enable_feature linux

if enabled rvct; then

# Check if we have CodeSourcery GCC in PATH. Needed for

# libraries

@@ -1000,14 +1001,14 @@

tune_cflags="-mtune="

if enabled dspr2; then

check_add_cflags -mips32r2 -mdspr2

- disable fast_unaligned

+ disable_feature fast_unaligned

check_add_cflags -march=${tgt_isa}

check_add_asflags -march=${tgt_isa}

check_add_asflags -KPIC

;;

ppc*)

- enable ppc

+ enable_feature ppc

bits=${tgt_isa##ppc}

link_with_cc=gcc

setup_gnu_toolchain

@@ -1155,7 +1156,7 @@

;;

universal*|*-gcc|generic-gnu)

link_with_cc=gcc

- enable gcc

+ enable_feature gcc

setup_gnu_toolchain

;;

esac

@@ -1189,6 +1190,12 @@

+ # default use_x86inc to yes if pic is no or 64bit or we are not on darwin

+ echo " checking here for x86inc \"${tgt_isa}\" \"$pic\" "

+ if [ ${tgt_isa} = x86_64 -o ! "$pic" = "yes" -o "${tgt_os#darwin}" = "${tgt_os}" ]; then

+ soft_enable use_x86inc

+ fi

# Position Independent Code (PIC) support, for building relocatable

# shared objects

enabled gcc && enabled pic && check_add_cflags -fPIC

@@ -1198,14 +1205,14 @@

enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0

# Check for strip utility variant

- ${STRIP} -V 2>/dev/null | grep GNU >/dev/null && enable gnu_strip

+ ${STRIP} -V 2>/dev/null | grep GNU >/dev/null && enable_feature gnu_strip

# Try to determine target endianness

check_cc <<EOF

unsigned int e = 'O'<<24 | '2'<<16 | 'B'<<8 | 'E';

EOF

[ -f "${TMP_O}" ] && od -A n -t x1 "${TMP_O}" | tr -d '\n' |

- grep '4f *32 *42 *45' >/dev/null 2>&1 && enable big_endian

+ grep '4f *32 *42 *45' >/dev/null 2>&1 && enable_feature big_endian

# Try to find which inline keywords are supported

check_cc <<EOF && INLINE="inline"

@@ -1230,7 +1237,7 @@

if enabled dspr2; then

if enabled big_endian; then

echo "dspr2 optimizations are available only for little endian platforms"

- disable dspr2

+ disable_feature dspr2

;;

@@ -1281,8 +1288,8 @@

print_webm_license() {

local destination=$1

- local prefix=$2

- local suffix=$3

+ local prefix="$2"

+ local suffix="$3"

shift 3

cat <<EOF > ${destination}

@@ -1303,7 +1310,7 @@

true;

}

-enable logging

+enable_feature logging

logfile="config.log"

self=$0

process() {

« no previous file with comments | « source/libvpx/build/make/armlink_adapter.sh ('k') | source/libvpx/build/make/gen_asm_deps.sh » ('j') | no next file with comments »