Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
libvpx
Commits
ab21378a
Commit
ab21378a
authored
11 years ago
by
James Zern
Committed by
Gerrit Code Review
11 years ago
Browse files
Options
Download
Plain Diff
Merge "Get rid of bashisms in the main build scripts"
parents
39f42c87
3526f1cd
v1.14.0-linphone
1.4.X
feature/update_to_v1.9.0-linphone
feature/uwp_nuget
forest
frame_parallel
highbitdepth
indianrunnerduck
javanwhistlingduck
khakicampbell
linphone
linphone-android
linphone-old
longtailedduck
m31-baseline
m49-2623
m52-2743
m54-2840
m56-2924
m66-3359
m68-3440
mandarinduck
mcw
mcw2
nextgen
nextgenv2
pcs-2013
playground
sandbox/Jingning/experimental
sandbox/Jingning/transcode
sandbox/Jingning/vpx
sandbox/aconverse@google.com/ansbench
sandbox/debargha/playground
sandbox/hkuang/frame_parallel
sandbox/hkuang@google.com/decode
sandbox/jimbankoski@google.com/proposed-aom
sandbox/jingning@google.com/decoder_test_suite
sandbox/jingning@google.com/experimental
sandbox/jzern@google.com/test
sandbox/wangch@google.com/vp9
sandbox/yaowu@google.com/mergeaom
stable-vp9-decoder
v1.12.0-linphone
v1.6.1_linphone
v1.7.0-linphone
v1.9.0-linphone
v1.9.0
v1.9.0-rc1
v1.8.2
v1.8.1
v1.8.0
v1.7.0
v1.6.1
v1.6.0
v1.5.0
v1.4.0
v1.3.0
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
build/make/configure.sh
+14
-13
build/make/configure.sh
build/make/gen_asm_deps.sh
+1
-1
build/make/gen_asm_deps.sh
build/make/version.sh
+1
-1
build/make/version.sh
configure
+1
-1
configure
with
17 additions
and
16 deletions
build/make/configure.sh
+
14
−
13
View file @
ab21378a
#!/bin/
ba
sh
#!/bin/sh
##
##
## configure.sh
## configure.sh
##
##
...
@@ -264,12 +264,13 @@ elif test ! -z "$TEMPDIR" ; then
...
@@ -264,12 +264,13 @@ elif test ! -z "$TEMPDIR" ; then
else
else
TMPDIRx
=
"/tmp"
TMPDIRx
=
"/tmp"
fi
fi
TMP_H
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RANDOM
}
.h"
RAND
=
$(
awk
'BEGIN { srand(); printf "%d\n",(rand() * 32768)}'
)
TMP_C
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RANDOM
}
.c"
TMP_H
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RAND
}
.h"
TMP_CC
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RANDOM
}
.cc"
TMP_C
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RAND
}
.c"
TMP_O
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RANDOM
}
.o"
TMP_CC
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RAND
}
.cc"
TMP_X
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RANDOM
}
.x"
TMP_O
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RAND
}
.o"
TMP_ASM
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RANDOM
}
.asm"
TMP_X
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RAND
}
.x"
TMP_ASM
=
"
${
TMPDIRx
}
/vpx-conf-
$$
-
${
RAND
}
.asm"
clean_temp_files
()
{
clean_temp_files
()
{
rm
-f
${
TMP_C
}
${
TMP_CC
}
${
TMP_H
}
${
TMP_O
}
${
TMP_X
}
${
TMP_ASM
}
rm
-f
${
TMP_C
}
${
TMP_CC
}
${
TMP_H
}
${
TMP_O
}
${
TMP_X
}
${
TMP_ASM
}
...
@@ -805,7 +806,7 @@ process_common_toolchain() {
...
@@ -805,7 +806,7 @@ process_common_toolchain() {
arch_int
=
${
arch_int
%%te
}
arch_int
=
${
arch_int
%%te
}
check_add_asflags
--defsym
ARCHITECTURE
=
${
arch_int
}
check_add_asflags
--defsym
ARCHITECTURE
=
${
arch_int
}
tune_cflags
=
"-mtune="
tune_cflags
=
"-mtune="
if
[
${
tgt_isa
}
=
=
"armv7"
]
;
then
if
[
${
tgt_isa
}
=
"armv7"
]
;
then
if
[
-z
"
${
float_abi
}
"
]
;
then
if
[
-z
"
${
float_abi
}
"
]
;
then
check_cpp
<<
EOF
&& float_abi=hard || float_abi=softfp
check_cpp
<<
EOF
&& float_abi=hard || float_abi=softfp
#ifndef __ARM_PCS_VFP
#ifndef __ARM_PCS_VFP
...
@@ -855,7 +856,7 @@ EOF
...
@@ -855,7 +856,7 @@ EOF
tune_cflags
=
"--cpu="
tune_cflags
=
"--cpu="
tune_asflags
=
"--cpu="
tune_asflags
=
"--cpu="
if
[
-z
"
${
tune_cpu
}
"
]
;
then
if
[
-z
"
${
tune_cpu
}
"
]
;
then
if
[
${
tgt_isa
}
=
=
"armv7"
]
;
then
if
[
${
tgt_isa
}
=
"armv7"
]
;
then
if
enabled neon
if
enabled neon
then
then
check_add_cflags
--fpu
=
softvfp+vfpv3
check_add_cflags
--fpu
=
softvfp+vfpv3
...
@@ -915,7 +916,7 @@ EOF
...
@@ -915,7 +916,7 @@ EOF
enable
pic
enable
pic
soft_enable realtime_only
soft_enable realtime_only
if
[
${
tgt_isa
}
=
=
"armv7"
]
;
then
if
[
${
tgt_isa
}
=
"armv7"
]
;
then
soft_enable runtime_cpu_detect
soft_enable runtime_cpu_detect
fi
fi
if
enabled runtime_cpu_detect
;
then
if
enabled runtime_cpu_detect
;
then
...
@@ -1191,7 +1192,7 @@ EOF
...
@@ -1191,7 +1192,7 @@ EOF
# default use_x86inc to yes if pic is no or 64bit or we are not on darwin
# 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
\"
"
echo
" checking here for x86inc
\"
${
tgt_isa
}
\"
\"
$pic
\"
"
if
[
${
tgt_isa
}
=
x86_64
-o
!
"
$pic
"
=
=
"yes"
-o
!
${
tgt_os
:0:6
}
=
darwin
]
;
then
if
[
${
tgt_isa
}
=
x86_64
-o
!
"
$pic
"
=
"yes"
-o
"
${
tgt_os
#darwin
}
"
=
"
${
tgt_os
}
"
]
;
then
soft_enable use_x86inc
soft_enable use_x86inc
fi
fi
...
@@ -1287,8 +1288,8 @@ print_config_h() {
...
@@ -1287,8 +1288,8 @@ print_config_h() {
print_webm_license
()
{
print_webm_license
()
{
local
destination
=
$1
local
destination
=
$1
local
prefix
=
$2
local
prefix
=
"
$2
"
local
suffix
=
$3
local
suffix
=
"
$3
"
shift
3
shift
3
cat
<<
EOF
>
${
destination
}
cat
<<
EOF
>
${
destination
}
${
prefix
}
Copyright (c) 2011 The WebM project authors. All Rights Reserved.
${
suffix
}
${
prefix
}
Copyright (c) 2011 The WebM project authors. All Rights Reserved.
${
suffix
}
...
...
This diff is collapsed.
Click to expand it.
build/make/gen_asm_deps.sh
+
1
−
1
View file @
ab21378a
#!/bin/
ba
sh
#!/bin/sh
##
##
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
##
...
...
This diff is collapsed.
Click to expand it.
build/make/version.sh
+
1
−
1
View file @
ab21378a
#!/bin/
ba
sh
#!/bin/sh
##
##
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
## Copyright (c) 2010 The WebM project authors. All Rights Reserved.
##
##
...
...
This diff is collapsed.
Click to expand it.
configure
+
1
−
1
View file @
ab21378a
#!/bin/
ba
sh
#!/bin/sh
##
##
## configure
## configure
##
##
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets