commit: c3220a3d428e7c5100347c953d16838c495978ae Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri May 29 08:31:11 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri May 29 08:31:11 2020 +0000 URL: https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=c3220a3d
7.5.0: fix libcpp ar detection Reported-by: Agostino Sarubbo Bug: https://bugs.gentoo.org/718004 Bug: https://gcc.gnu.org/PR94657 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> 7.5.0/gentoo/24_all_libcpp-ar.patch | 143 ++++++++++++++++++++++++++++++++++++ 7.5.0/gentoo/README.history | 3 + 2 files changed, 146 insertions(+) diff --git a/7.5.0/gentoo/24_all_libcpp-ar.patch b/7.5.0/gentoo/24_all_libcpp-ar.patch new file mode 100644 index 0000000..55f2944 --- /dev/null +++ b/7.5.0/gentoo/24_all_libcpp-ar.patch @@ -0,0 +1,143 @@ +https://bugs.gentoo.org/718004 +https://gcc.gnu.org/PR94657 + +Make sue we use ${CHOST}-ar and not 'ar'. + +--- a/libcpp/configure.ac ++++ b/libcpp/configure.ac +@@ -12,6 +12,7 @@ AC_PROG_INSTALL + AC_PROG_CC + AC_PROG_CXX + AC_PROG_RANLIB ++AC_CHECK_TOOL(AR, ar) + + AC_USE_SYSTEM_EXTENSIONS + AC_SYS_LARGEFILE +--- a/libcpp/Makefile.in ++++ b/libcpp/Makefile.in +@@ -25,7 +25,7 @@ srcdir = @srcdir@ + top_builddir = . + VPATH = @srcdir@ + INSTALL = @INSTALL@ +-AR = ar ++AR = @AR@ + ARFLAGS = cru + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ +--- a/libcpp/configure ++++ b/libcpp/configure +@@ -657,6 +657,7 @@ ACLOCAL + EGREP + GREP + CPP ++AR + RANLIB + ac_ct_CXX + CXXFLAGS +@@ -1038,6 +1039,7 @@ do + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + ++ + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ +@@ -4006,6 +4008,98 @@ else + RANLIB="$ac_cv_prog_RANLIB" + fi + ++if test -n "$ac_tool_prefix"; then ++ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. ++set dummy ${ac_tool_prefix}ar; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_AR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$AR"; then ++ ac_cv_prog_AR="$AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_AR="${ac_tool_prefix}ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++AR=$ac_cv_prog_AR ++if test -n "$AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 ++$as_echo "$AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ ++fi ++if test -z "$ac_cv_prog_AR"; then ++ ac_ct_AR=$AR ++ # Extract the first word of "ar", so it can be a program name with args. ++set dummy ar; ac_word=$2 ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 ++$as_echo_n "checking for $ac_word... " >&6; } ++if ${ac_cv_prog_ac_ct_AR+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ if test -n "$ac_ct_AR"; then ++ ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. ++else ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_prog_ac_ct_AR="ar" ++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++ done ++IFS=$as_save_IFS ++ ++fi ++fi ++ac_ct_AR=$ac_cv_prog_ac_ct_AR ++if test -n "$ac_ct_AR"; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 ++$as_echo "$ac_ct_AR" >&6; } ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++fi ++ ++ if test "x$ac_ct_AR" = x; then ++ AR="" ++ else ++ case $cross_compiling:$ac_tool_warned in ++yes:) ++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 ++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ++ac_tool_warned=yes ;; ++esac ++ AR=$ac_ct_AR ++ fi ++else ++ AR="$ac_cv_prog_AR" ++fi ++ + + + ac_ext=c diff --git a/7.5.0/gentoo/README.history b/7.5.0/gentoo/README.history index c594c94..f95001c 100644 --- a/7.5.0/gentoo/README.history +++ b/7.5.0/gentoo/README.history @@ -1,3 +1,6 @@ +3 TODO + + 24_all_libcpp-ar.patch + 2 21 Mar 2020 + 22_all_libsanitizer-p1.patch + 23_all_libsanitizer-p2.patch
