mirror of
https://github.com/libsdl-org/SDL.git
synced 2025-09-06 03:18:13 +00:00
acinclude/libtool.m4: updates from mainstream git:
- Disables chained fixups for macOS ('-no_fixup_chains' if supported by linker), because it is not compatible with '-undefined dynamic_lookup' - Fixes Wstrict-prototypes warnings - Regenerate the 'configure' script.
This commit is contained in:
33
acinclude/libtool.m4
vendored
33
acinclude/libtool.m4
vendored
@@ -1023,6 +1023,21 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
|
|||||||
rm -f conftest.*
|
rm -f conftest.*
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
|
# Feature test to disable chained fixups since it is not
|
||||||
|
# compatible with '-undefined dynamic_lookup'
|
||||||
|
AC_CACHE_CHECK([for -no_fixup_chains linker flag],
|
||||||
|
[lt_cv_support_no_fixup_chains],
|
||||||
|
[ save_LDFLAGS=$LDFLAGS
|
||||||
|
LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
|
||||||
|
AC_LINK_IFELSE(
|
||||||
|
[AC_LANG_PROGRAM([],[])],
|
||||||
|
lt_cv_support_no_fixup_chains=yes,
|
||||||
|
lt_cv_support_no_fixup_chains=no
|
||||||
|
)
|
||||||
|
LDFLAGS=$save_LDFLAGS
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
AC_CACHE_CHECK([for -exported_symbols_list linker flag],
|
||||||
[lt_cv_ld_exported_symbols_list],
|
[lt_cv_ld_exported_symbols_list],
|
||||||
[lt_cv_ld_exported_symbols_list=no
|
[lt_cv_ld_exported_symbols_list=no
|
||||||
@@ -1047,7 +1062,7 @@ _LT_EOF
|
|||||||
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
|
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
|
||||||
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
|
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
|
||||||
cat > conftest.c << _LT_EOF
|
cat > conftest.c << _LT_EOF
|
||||||
int main() { return 0;}
|
int main(void) { return 0;}
|
||||||
_LT_EOF
|
_LT_EOF
|
||||||
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
|
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
|
||||||
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
||||||
@@ -1072,7 +1087,11 @@ _LT_EOF
|
|||||||
10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
|
10.[[012]],*|,*powerpc*-darwin[[5-8]]*)
|
||||||
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
||||||
*)
|
*)
|
||||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
|
||||||
|
if test yes = "$lt_cv_support_no_fixup_chains"; then
|
||||||
|
_lt_dar_allow_undefined='$_lt_dar_allow_undefined $wl-no_fixup_chains'
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -1862,11 +1881,11 @@ else
|
|||||||
/* When -fvisibility=hidden is used, assume the code has been annotated
|
/* When -fvisibility=hidden is used, assume the code has been annotated
|
||||||
correspondingly for the symbols needed. */
|
correspondingly for the symbols needed. */
|
||||||
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
||||||
int fnord () __attribute__((visibility("default")));
|
int fnord (void) __attribute__((visibility("default")));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int fnord () { return 42; }
|
int fnord (void) { return 42; }
|
||||||
int main ()
|
int main (void)
|
||||||
{
|
{
|
||||||
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
||||||
int status = $lt_dlunknown;
|
int status = $lt_dlunknown;
|
||||||
@@ -4052,7 +4071,7 @@ void nm_test_func(void){}
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
int main(){nm_test_var='a';nm_test_func();return(0);}
|
int main(void){nm_test_var='a';nm_test_func();return(0);}
|
||||||
_LT_EOF
|
_LT_EOF
|
||||||
|
|
||||||
if AC_TRY_EVAL(ac_compile); then
|
if AC_TRY_EVAL(ac_compile); then
|
||||||
@@ -6218,7 +6237,7 @@ _LT_TAGVAR(objext, $1)=$objext
|
|||||||
lt_simple_compile_test_code="int some_variable = 0;"
|
lt_simple_compile_test_code="int some_variable = 0;"
|
||||||
|
|
||||||
# Code to be used in simple link tests
|
# Code to be used in simple link tests
|
||||||
lt_simple_link_test_code='int main(){return(0);}'
|
lt_simple_link_test_code='int main(void){return(0);}'
|
||||||
|
|
||||||
_LT_TAG_COMPILER
|
_LT_TAG_COMPILER
|
||||||
# Save the default compiler, since it gets overwritten when the other
|
# Save the default compiler, since it gets overwritten when the other
|
||||||
|
68
configure
vendored
68
configure
vendored
@@ -6836,7 +6836,7 @@ void nm_test_func(void){}
|
|||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
int main(){nm_test_var='a';nm_test_func();return(0);}
|
int main(void){nm_test_var='a';nm_test_func();return(0);}
|
||||||
_LT_EOF
|
_LT_EOF
|
||||||
|
|
||||||
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
|
||||||
@@ -8098,6 +8098,43 @@ fi
|
|||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
|
||||||
printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
|
printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
|
||||||
|
|
||||||
|
# Feature test to disable chained fixups since it is not
|
||||||
|
# compatible with '-undefined dynamic_lookup'
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -no_fixup_chains linker flag" >&5
|
||||||
|
printf %s "checking for -no_fixup_chains linker flag... " >&6; }
|
||||||
|
if test ${lt_cv_support_no_fixup_chains+y}
|
||||||
|
then :
|
||||||
|
printf %s "(cached) " >&6
|
||||||
|
else $as_nop
|
||||||
|
save_LDFLAGS=$LDFLAGS
|
||||||
|
LDFLAGS="$LDFLAGS -Wl,-no_fixup_chains"
|
||||||
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
int
|
||||||
|
main (void)
|
||||||
|
{
|
||||||
|
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
if ac_fn_c_try_link "$LINENO"
|
||||||
|
then :
|
||||||
|
lt_cv_support_no_fixup_chains=yes
|
||||||
|
else $as_nop
|
||||||
|
lt_cv_support_no_fixup_chains=no
|
||||||
|
|
||||||
|
fi
|
||||||
|
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
LDFLAGS=$save_LDFLAGS
|
||||||
|
|
||||||
|
|
||||||
|
fi
|
||||||
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_support_no_fixup_chains" >&5
|
||||||
|
printf "%s\n" "$lt_cv_support_no_fixup_chains" >&6; }
|
||||||
|
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
|
||||||
printf %s "checking for -exported_symbols_list linker flag... " >&6; }
|
printf %s "checking for -exported_symbols_list linker flag... " >&6; }
|
||||||
if test ${lt_cv_ld_exported_symbols_list+y}
|
if test ${lt_cv_ld_exported_symbols_list+y}
|
||||||
@@ -8150,7 +8187,7 @@ _LT_EOF
|
|||||||
echo "$RANLIB libconftest.a" >&5
|
echo "$RANLIB libconftest.a" >&5
|
||||||
$RANLIB libconftest.a 2>&5
|
$RANLIB libconftest.a 2>&5
|
||||||
cat > conftest.c << _LT_EOF
|
cat > conftest.c << _LT_EOF
|
||||||
int main() { return 0;}
|
int main(void) { return 0;}
|
||||||
_LT_EOF
|
_LT_EOF
|
||||||
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
|
echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
|
||||||
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
|
||||||
@@ -8178,7 +8215,11 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; }
|
|||||||
10.[012],*|,*powerpc*-darwin[5-8]*)
|
10.[012],*|,*powerpc*-darwin[5-8]*)
|
||||||
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
||||||
*)
|
*)
|
||||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup'
|
||||||
|
if test yes = "$lt_cv_support_no_fixup_chains"; then
|
||||||
|
_lt_dar_allow_undefined='$_lt_dar_allow_undefined $wl-no_fixup_chains'
|
||||||
|
fi
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@@ -9078,7 +9119,7 @@ objext=$objext
|
|||||||
lt_simple_compile_test_code="int some_variable = 0;"
|
lt_simple_compile_test_code="int some_variable = 0;"
|
||||||
|
|
||||||
# Code to be used in simple link tests
|
# Code to be used in simple link tests
|
||||||
lt_simple_link_test_code='int main(){return(0);}'
|
lt_simple_link_test_code='int main(void){return(0);}'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -12629,11 +12670,11 @@ else
|
|||||||
/* When -fvisibility=hidden is used, assume the code has been annotated
|
/* When -fvisibility=hidden is used, assume the code has been annotated
|
||||||
correspondingly for the symbols needed. */
|
correspondingly for the symbols needed. */
|
||||||
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
||||||
int fnord () __attribute__((visibility("default")));
|
int fnord (void) __attribute__((visibility("default")));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int fnord () { return 42; }
|
int fnord (void) { return 42; }
|
||||||
int main ()
|
int main (void)
|
||||||
{
|
{
|
||||||
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
||||||
int status = $lt_dlunknown;
|
int status = $lt_dlunknown;
|
||||||
@@ -12736,11 +12777,11 @@ else
|
|||||||
/* When -fvisibility=hidden is used, assume the code has been annotated
|
/* When -fvisibility=hidden is used, assume the code has been annotated
|
||||||
correspondingly for the symbols needed. */
|
correspondingly for the symbols needed. */
|
||||||
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
|
||||||
int fnord () __attribute__((visibility("default")));
|
int fnord (void) __attribute__((visibility("default")));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
int fnord () { return 42; }
|
int fnord (void) { return 42; }
|
||||||
int main ()
|
int main (void)
|
||||||
{
|
{
|
||||||
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
|
||||||
int status = $lt_dlunknown;
|
int status = $lt_dlunknown;
|
||||||
@@ -19218,13 +19259,15 @@ then :
|
|||||||
ac_cv_func_alloca_works=yes
|
ac_cv_func_alloca_works=yes
|
||||||
else $as_nop
|
else $as_nop
|
||||||
ac_cv_func_alloca_works=no
|
ac_cv_func_alloca_works=no
|
||||||
|
|
||||||
fi
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
rm -f core conftest.err conftest.$ac_objext conftest.beam \
|
||||||
conftest$ac_exeext conftest.$ac_ext
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
|
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
|
||||||
printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
|
printf "%s\n" "$ac_cv_func_alloca_works" >&6; }
|
||||||
fi
|
|
||||||
|
|
||||||
if test $ac_cv_func_alloca_works = yes; then
|
if test $ac_cv_func_alloca_works = yes; then
|
||||||
|
|
||||||
@@ -26411,6 +26454,9 @@ else $as_nop
|
|||||||
fi
|
fi
|
||||||
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
|
||||||
;;
|
;;
|
||||||
|
*-*-solaris*)
|
||||||
|
enable_video_vulkan=no
|
||||||
|
;;
|
||||||
*-*-darwin*)
|
*-*-darwin*)
|
||||||
save_CFLAGS="$CFLAGS"
|
save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS -x objective-c"
|
CFLAGS="$CFLAGS -x objective-c"
|
||||||
|
Reference in New Issue
Block a user