1 Shell translations. Should probably be removed. |
|
2 |
|
3 --- mozilla-esr31/js/src/configure.orig 2015-06-04 17:42:51.357938258 -0700 |
|
4 +++ mozilla-esr31/js/src/configure 2015-06-04 17:42:51.371806503 -0700 |
|
5 @@ -1291,7 +1291,7 @@ |
|
6 fi |
|
7 |
|
8 fi |
|
9 - IS_GCC=$($CC -v 2>&1 | grep gcc) |
|
10 + IS_GCC=`$CC -v 2>&1 | grep gcc` |
|
11 if test -n "$IS_GCC" |
|
12 then |
|
13 echo gcc is known to be broken on OS X, please use clang. |
|
14 @@ -4342,7 +4342,7 @@ |
|
15 for base in $MOZILLA_CENTRAL_PATH $_topsrcdir $_topsrcdir/../..; do |
|
16 possible=$base/python/mozbuild/mozbuild/virtualenv.py |
|
17 |
|
18 - if test -e $possible; then |
|
19 + if test -f $possible; then |
|
20 _virtualenv_topsrcdir=$base |
|
21 _virtualenv_populate_path=$possible |
|
22 break |
|
23 @@ -8861,12 +8861,12 @@ |
|
24 |
|
25 if test "$GNU_CC" -a -n "$MOZ_FORCE_GOLD"; then |
|
26 if $CC -Wl,--version 2>&1 | grep -q "GNU ld"; then |
|
27 - GOLD=$($CC -print-prog-name=ld.gold) |
|
28 + GOLD=`$CC -print-prog-name=ld.gold` |
|
29 case "$GOLD" in |
|
30 /*) |
|
31 ;; |
|
32 *) |
|
33 - GOLD=$(which $GOLD) |
|
34 + GOLD=`which $GOLD` |
|
35 ;; |
|
36 esac |
|
37 if test -n "$GOLD"; then |
|
38 @@ -15668,7 +15668,8 @@ |
|
39 _CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
|
40 case "$host" in |
|
41 *-mingw*) |
|
42 - _CONFIG_SHELL=$(cd $(dirname $_CONFIG_SHELL); pwd -W)/$(basename $_CONFIG_SHELL) |
|
43 + tmp_DIRNAME=`dirname "$_CONFIG_SHELL"` |
|
44 + _CONFIG_SHELL=`(cd $tmp_DIRNAME; pwd -W)`/`(basename $_CONFIG_SHELL)` |
|
45 if test ! -e "$_CONFIG_SHELL" -a -e "${_CONFIG_SHELL}.exe"; then |
|
46 _CONFIG_SHELL="${_CONFIG_SHELL}.exe" |
|
47 fi |
|
48 @@ -15793,7 +15794,8 @@ |
|
49 _CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
|
50 case "$host" in |
|
51 *-mingw*) |
|
52 - _CONFIG_SHELL=$(cd $(dirname $_CONFIG_SHELL); pwd -W)/$(basename $_CONFIG_SHELL) |
|
53 + tmp_DIRNAME=`dirname "$_CONFIG_SHELL"` |
|
54 + _CONFIG_SHELL=`(cd $tmp_DIRNAME; pwd -W)`/`(basename $_CONFIG_SHELL)` |
|
55 if test ! -e "$_CONFIG_SHELL" -a -e "${_CONFIG_SHELL}.exe"; then |
|
56 _CONFIG_SHELL="${_CONFIG_SHELL}.exe" |
|
57 fi |
|
58 @@ -16044,7 +16046,8 @@ |
|
59 _CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} |
|
60 case "$host" in |
|
61 *-mingw*) |
|
62 - _CONFIG_SHELL=$(cd $(dirname $_CONFIG_SHELL); pwd -W)/$(basename $_CONFIG_SHELL) |
|
63 + tmp_DIRNAME=`dirname "$_CONFIG_SHELL"` |
|
64 + _CONFIG_SHELL=`(cd $tmp_DIRNAME; pwd -W)`/`(basename $_CONFIG_SHELL)` |
|
65 if test ! -e "$_CONFIG_SHELL" -a -e "${_CONFIG_SHELL}.exe"; then |
|
66 _CONFIG_SHELL="${_CONFIG_SHELL}.exe" |
|
67 fi |
|
68 @@ -16613,9 +16616,12 @@ |
|
69 |
|
70 chmod +x $CONFIG_STATUS |
|
71 rm -fr confdefs* $ac_clean_files |
|
72 -if test "$no_create" != yes && ! ${PYTHON} $CONFIG_STATUS; then |
|
73 +if test "$no_create" != yes; then |
|
74 + ${PYTHON} $CONFIG_STATUS |
|
75 + if test "$?" != 0; then |
|
76 trap '' EXIT |
|
77 exit 1 |
|
78 + fi |
|
79 fi |
|
80 |
|
81 fi |
|