зеркало из https://github.com/mozilla/pjs.git
Irix requires the -f option when stripping non-executables.
This commit is contained in:
Родитель
be1ecc4541
Коммит
6ec153ef1b
|
@ -3106,6 +3106,7 @@ EOF
|
||||||
PR_MD_ASFILES=os_Irix.s
|
PR_MD_ASFILES=os_Irix.s
|
||||||
MKSHLIB='$(LD) $(DSO_LDOPTS) -rdata_shared -shared -soname $(notdir $@) -o $@'
|
MKSHLIB='$(LD) $(DSO_LDOPTS) -rdata_shared -shared -soname $(notdir $@) -o $@'
|
||||||
#DSO_LDOPTS='-elf -shared -all'
|
#DSO_LDOPTS='-elf -shared -all'
|
||||||
|
STRIP="$STRIP -f"
|
||||||
if test -n "$USE_64"; then
|
if test -n "$USE_64"; then
|
||||||
MDCPUCFG_H=_irix64.cfg
|
MDCPUCFG_H=_irix64.cfg
|
||||||
else
|
else
|
||||||
|
@ -4153,12 +4154,12 @@ fi
|
||||||
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
if test -z "$SKIP_LIBRARY_CHECKS"; then
|
||||||
|
|
||||||
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
echo $ac_n "checking for dlopen""... $ac_c" 1>&6
|
||||||
echo "configure:4157: checking for dlopen" >&5
|
echo "configure:4158: checking for dlopen" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4162 "configure"
|
#line 4163 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* System header to define __stub macros and hopefully few prototypes,
|
/* System header to define __stub macros and hopefully few prototypes,
|
||||||
which can conflict with char dlopen(); below. */
|
which can conflict with char dlopen(); below. */
|
||||||
|
@ -4181,7 +4182,7 @@ dlopen();
|
||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:4185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:4186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_func_dlopen=yes"
|
eval "ac_cv_func_dlopen=yes"
|
||||||
else
|
else
|
||||||
|
@ -4200,7 +4201,7 @@ else
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
|
||||||
echo "configure:4204: checking for dlopen in -ldl" >&5
|
echo "configure:4205: checking for dlopen in -ldl" >&5
|
||||||
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
|
||||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
@ -4208,7 +4209,7 @@ else
|
||||||
ac_save_LIBS="$LIBS"
|
ac_save_LIBS="$LIBS"
|
||||||
LIBS="-ldl $LIBS"
|
LIBS="-ldl $LIBS"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4212 "configure"
|
#line 4213 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* Override any gcc2 internal prototype to avoid an error. */
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
/* We use char because int might match the return type of a gcc2
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
@ -4219,7 +4220,7 @@ int main() {
|
||||||
dlopen()
|
dlopen()
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:4223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:4224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_lib_$ac_lib_var=yes"
|
eval "ac_cv_lib_$ac_lib_var=yes"
|
||||||
else
|
else
|
||||||
|
@ -4246,7 +4247,7 @@ fi
|
||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
|
||||||
echo "configure:4250: checking how to run the C preprocessor" >&5
|
echo "configure:4251: checking how to run the C preprocessor" >&5
|
||||||
# On Suns, sometimes $CPP names a directory.
|
# On Suns, sometimes $CPP names a directory.
|
||||||
if test -n "$CPP" && test -d "$CPP"; then
|
if test -n "$CPP" && test -d "$CPP"; then
|
||||||
CPP=
|
CPP=
|
||||||
|
@ -4261,13 +4262,13 @@ else
|
||||||
# On the NeXT, cc -E runs the code through the compiler's parser,
|
# On the NeXT, cc -E runs the code through the compiler's parser,
|
||||||
# not just through cpp.
|
# not just through cpp.
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4265 "configure"
|
#line 4266 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
Syntax Error
|
Syntax Error
|
||||||
EOF
|
EOF
|
||||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||||
{ (eval echo configure:4271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
{ (eval echo configure:4272: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||||
if test -z "$ac_err"; then
|
if test -z "$ac_err"; then
|
||||||
:
|
:
|
||||||
|
@ -4278,13 +4279,13 @@ else
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
CPP="${CC-cc} -E -traditional-cpp"
|
CPP="${CC-cc} -E -traditional-cpp"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4282 "configure"
|
#line 4283 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
Syntax Error
|
Syntax Error
|
||||||
EOF
|
EOF
|
||||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||||
{ (eval echo configure:4288: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
{ (eval echo configure:4289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||||
if test -z "$ac_err"; then
|
if test -z "$ac_err"; then
|
||||||
:
|
:
|
||||||
|
@ -4295,13 +4296,13 @@ else
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
CPP="${CC-cc} -nologo -E"
|
CPP="${CC-cc} -nologo -E"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4299 "configure"
|
#line 4300 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
Syntax Error
|
Syntax Error
|
||||||
EOF
|
EOF
|
||||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||||
{ (eval echo configure:4305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
{ (eval echo configure:4306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||||
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
|
||||||
if test -z "$ac_err"; then
|
if test -z "$ac_err"; then
|
||||||
:
|
:
|
||||||
|
@ -4327,13 +4328,13 @@ echo "$ac_t""$CPP" 1>&6
|
||||||
|
|
||||||
if test $ac_cv_prog_gcc = yes; then
|
if test $ac_cv_prog_gcc = yes; then
|
||||||
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
|
||||||
echo "configure:4331: checking whether ${CC-cc} needs -traditional" >&5
|
echo "configure:4332: checking whether ${CC-cc} needs -traditional" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
ac_pattern="Autoconf.*'x'"
|
ac_pattern="Autoconf.*'x'"
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4337 "configure"
|
#line 4338 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <sgtty.h>
|
#include <sgtty.h>
|
||||||
Autoconf TIOCGETP
|
Autoconf TIOCGETP
|
||||||
|
@ -4351,7 +4352,7 @@ rm -f conftest*
|
||||||
|
|
||||||
if test $ac_cv_prog_gcc_traditional = no; then
|
if test $ac_cv_prog_gcc_traditional = no; then
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4355 "configure"
|
#line 4356 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
#include <termio.h>
|
#include <termio.h>
|
||||||
Autoconf TCGETA
|
Autoconf TCGETA
|
||||||
|
@ -4375,12 +4376,12 @@ fi
|
||||||
for ac_func in lchown strerror
|
for ac_func in lchown strerror
|
||||||
do
|
do
|
||||||
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
|
||||||
echo "configure:4379: checking for $ac_func" >&5
|
echo "configure:4380: checking for $ac_func" >&5
|
||||||
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 4384 "configure"
|
#line 4385 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
/* System header to define __stub macros and hopefully few prototypes,
|
/* System header to define __stub macros and hopefully few prototypes,
|
||||||
which can conflict with char $ac_func(); below. */
|
which can conflict with char $ac_func(); below. */
|
||||||
|
@ -4403,7 +4404,7 @@ $ac_func();
|
||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:4407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:4408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
eval "ac_cv_func_$ac_func=yes"
|
eval "ac_cv_func_$ac_func=yes"
|
||||||
else
|
else
|
||||||
|
@ -4434,7 +4435,7 @@ done
|
||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6
|
||||||
echo "configure:4438: checking for pthread_create in -lpthreads" >&5
|
echo "configure:4439: checking for pthread_create in -lpthreads" >&5
|
||||||
echo "
|
echo "
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
void *foo(void *v) { int a = 1; }
|
void *foo(void *v) { int a = 1; }
|
||||||
|
@ -4456,7 +4457,7 @@ echo "
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
|
||||||
echo "configure:4460: checking for pthread_create in -lpthread" >&5
|
echo "configure:4461: checking for pthread_create in -lpthread" >&5
|
||||||
echo "
|
echo "
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
void *foo(void *v) { int a = 1; }
|
void *foo(void *v) { int a = 1; }
|
||||||
|
@ -4478,7 +4479,7 @@ echo "
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
|
||||||
echo "configure:4482: checking for pthread_create in -lc_r" >&5
|
echo "configure:4483: checking for pthread_create in -lc_r" >&5
|
||||||
echo "
|
echo "
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
void *foo(void *v) { int a = 1; }
|
void *foo(void *v) { int a = 1; }
|
||||||
|
@ -4500,7 +4501,7 @@ echo "
|
||||||
echo "$ac_t""no" 1>&6
|
echo "$ac_t""no" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6
|
||||||
echo "configure:4504: checking for pthread_create in -lc" >&5
|
echo "configure:4505: checking for pthread_create in -lc" >&5
|
||||||
echo "
|
echo "
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
void *foo(void *v) { int a = 1; }
|
void *foo(void *v) { int a = 1; }
|
||||||
|
@ -4650,7 +4651,7 @@ if test -n "$USE_PTHREADS"; then
|
||||||
rm -f conftest*
|
rm -f conftest*
|
||||||
ac_cv_have_dash_pthread=no
|
ac_cv_have_dash_pthread=no
|
||||||
echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
|
echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6
|
||||||
echo "configure:4654: checking whether ${CC-cc} accepts -pthread" >&5
|
echo "configure:4655: checking whether ${CC-cc} accepts -pthread" >&5
|
||||||
echo 'int main() { return 0; }' | cat > conftest.c
|
echo 'int main() { return 0; }' | cat > conftest.c
|
||||||
${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
|
${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1
|
||||||
if test $? -eq 0; then
|
if test $? -eq 0; then
|
||||||
|
@ -4666,7 +4667,7 @@ echo "configure:4654: checking whether ${CC-cc} accepts -pthread" >&5
|
||||||
ac_cv_have_dash_pthreads=no
|
ac_cv_have_dash_pthreads=no
|
||||||
if test "$ac_cv_have_dash_pthread" = "no"; then
|
if test "$ac_cv_have_dash_pthread" = "no"; then
|
||||||
echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
|
echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6
|
||||||
echo "configure:4670: checking whether ${CC-cc} accepts -pthreads" >&5
|
echo "configure:4671: checking whether ${CC-cc} accepts -pthreads" >&5
|
||||||
echo 'int main() { return 0; }' | cat > conftest.c
|
echo 'int main() { return 0; }' | cat > conftest.c
|
||||||
${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
|
${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1
|
||||||
if test $? -eq 0; then
|
if test $? -eq 0; then
|
||||||
|
|
|
@ -802,6 +802,7 @@ case "$target" in
|
||||||
PR_MD_ASFILES=os_Irix.s
|
PR_MD_ASFILES=os_Irix.s
|
||||||
MKSHLIB='$(LD) $(DSO_LDOPTS) -rdata_shared -shared -soname $(notdir $@) -o $@'
|
MKSHLIB='$(LD) $(DSO_LDOPTS) -rdata_shared -shared -soname $(notdir $@) -o $@'
|
||||||
#DSO_LDOPTS='-elf -shared -all'
|
#DSO_LDOPTS='-elf -shared -all'
|
||||||
|
STRIP="$STRIP -f"
|
||||||
if test -n "$USE_64"; then
|
if test -n "$USE_64"; then
|
||||||
MDCPUCFG_H=_irix64.cfg
|
MDCPUCFG_H=_irix64.cfg
|
||||||
else
|
else
|
||||||
|
|
Загрузка…
Ссылка в новой задаче