347 lines
12 KiB
Diff
347 lines
12 KiB
Diff
From e6dff3a1cbca8bab212bf49ecffc4e1a113472ef Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Yong <10walls@gmail.com>
|
|
Date: Sun, 22 Mar 2020 10:03:10 +0800
|
|
Subject: [PATCH 18/18] libstdc++: regenerate configure
|
|
|
|
Signed-off-by: Jonathan Yong <10walls@gmail.com>
|
|
---
|
|
libstdc++-v3/configure | 224 +++++++++++++++++++++++++++++++++++++++--
|
|
1 file changed, 213 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
|
|
index cc6e45592e1..7af78996dd2 100755
|
|
--- a/libstdc++-v3/configure
|
|
+++ b/libstdc++-v3/configure
|
|
@@ -871,6 +871,7 @@ infodir
|
|
docdir
|
|
oldincludedir
|
|
includedir
|
|
+runstatedir
|
|
localstatedir
|
|
sharedstatedir
|
|
sysconfdir
|
|
@@ -998,6 +999,7 @@ datadir='${datarootdir}'
|
|
sysconfdir='${prefix}/etc'
|
|
sharedstatedir='${prefix}/com'
|
|
localstatedir='${prefix}/var'
|
|
+runstatedir='${localstatedir}/run'
|
|
includedir='${prefix}/include'
|
|
oldincludedir='/usr/include'
|
|
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
|
@@ -1250,6 +1252,15 @@ do
|
|
| -silent | --silent | --silen | --sile | --sil)
|
|
silent=yes ;;
|
|
|
|
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
|
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
|
+ | --run | --ru | --r)
|
|
+ ac_prev=runstatedir ;;
|
|
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
|
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
|
+ | --run=* | --ru=* | --r=*)
|
|
+ runstatedir=$ac_optarg ;;
|
|
+
|
|
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
|
ac_prev=sbindir ;;
|
|
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
|
@@ -1387,7 +1398,7 @@ fi
|
|
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
|
datadir sysconfdir sharedstatedir localstatedir includedir \
|
|
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
|
- libdir localedir mandir
|
|
+ libdir localedir mandir runstatedir
|
|
do
|
|
eval ac_val=\$$ac_var
|
|
# Remove trailing slashes.
|
|
@@ -1540,6 +1551,7 @@ Fine tuning of the installation directories:
|
|
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
|
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
|
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
|
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
|
--libdir=DIR object code libraries [EPREFIX/lib]
|
|
--includedir=DIR C header files [PREFIX/include]
|
|
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
|
@@ -22901,7 +22913,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -30083,7 +30114,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -36006,7 +36056,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -47913,7 +47982,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -48178,7 +48266,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -48645,7 +48752,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -55013,7 +55139,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -60944,7 +61089,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -61145,7 +61309,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
@@ -61365,7 +61548,26 @@ $as_echo "$ac_gcsections" >&6; }
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5
|
|
$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; }
|
|
- cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"`
|
|
+ ac_save_ldflags="$LDFLAGS"
|
|
+ LDFLAGS="$LDFLAGS -Wl,-z,relro"
|
|
+ if test x$gcc_no_link = xyes; then
|
|
+ as_fn_error $? "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
|
|
+fi
|
|
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+ int main() { return 0; }
|
|
+
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ cxx_z_relo="1"
|
|
+else
|
|
+ cxx_z_relo=""
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+ LDFLAGS="$ac_save_ldflags"
|
|
+
|
|
if test -n "$cxx_z_relo"; then
|
|
OPT_LDFLAGS="-Wl,-z,relro"
|
|
ac_ld_relro=yes
|
|
--
|
|
2.28.0
|
|
|