[gentoo-commits] repo/gentoo:master commit in: eclass/, sys-devel/gcc/files/, dev-lang/gnat-gpl/files/

[Sergei Trofimovich]

commit:     eaa3057f4602c72ef847775109663cd03578d0f9
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 19 08:26:15 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 08:26:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa3057f

toolchain.eclass: stop installing /usr/bin/c89 and /usr/bin/c99

Ownership of /usr/bin/c89 and /usr/bin/c99 was switched to
sys-devel/gcc-config-2.3.1.

Closes: https://bugs.gentoo.org/728722
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-lang/gnat-gpl/files/c89 | 20 --------------------
 dev-lang/gnat-gpl/files/c99 | 21 ---------------------
 eclass/toolchain.eclass     | 15 ---------------
 sys-devel/gcc/files/c89     | 20 --------------------
 sys-devel/gcc/files/c99     | 21 ---------------------
 5 files changed, 97 deletions(-)

diff --git a/dev-lang/gnat-gpl/files/c89 b/dev-lang/gnat-gpl/files/c89
deleted file mode 100644
index cee0325f50f..00000000000
--- a/dev-lang/gnat-gpl/files/c89
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-2.95):
-# 	-ansi
-# 	-std=c89
-# 	-std=iso9899:1990
-
-for i; do
-    case "$i" in
-	-ansi|-std=c89|-std=iso9899:1990)
-	    ;;
-	-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"

diff --git a/dev-lang/gnat-gpl/files/c99 b/dev-lang/gnat-gpl/files/c99
deleted file mode 100644
index c9542095e38..00000000000
--- a/dev-lang/gnat-gpl/files/c99
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-3.3):
-# 	-std=c99
-# 	-std=c9x
-# 	-std=iso9899:1999
-# 	-std=iso9899:199x
-
-for i; do
-    case "$i" in
-	-std=c9[9x]|-std=iso9899:199[9x])
-	    ;;
-	-ansi|-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}

diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass
index 7a4364af4e6..db02ee6be50 100644
--- a/eclass/toolchain.eclass
+++ b/eclass/toolchain.eclass
@@ -1785,11 +1785,6 @@ toolchain_src_install() {
 	# prune empty dirs left behind
 	find "${ED}" -depth -type d -delete 2>/dev/null
 
-	if ! is_crosscompile && [[ ${PN} != "kgcc64" ]] ; then
-		exeinto "${DATAPATH#${EPREFIX}}"
-		doexe "${FILESDIR}"/c{89,99} || die
-	fi
-
 	# libstdc++.la: Delete as it doesn't add anything useful: g++ itself
 	# handles linkage correctly in the dynamic & static case.  It also just
 	# causes us pain: any C++ progs/libs linking with libtool will gain a
@@ -2096,11 +2091,6 @@ toolchain_pkg_postinst() {
 		rm -f "${EROOT%/}"/sbin/fix_libtool_files.sh
 		rm -f "${EROOT%/}"/usr/sbin/fix_libtool_files.sh
 		rm -f "${EROOT%/}"/usr/share/gcc-data/fixlafiles.awk
-
-		mkdir -p "${EROOT%/}"/usr/bin
-		# Since these aren't critical files and portage sucks with
-		# handling of binpkgs, don't require these to be found
-		cp "${ROOT%/}${DATAPATH}"/c{89,99} "${EROOT%/}"/usr/bin/ 2>/dev/null
 	fi
 }
 
@@ -2110,11 +2100,6 @@ toolchain_pkg_postrm() {
 		eselect compiler-shadow clean all
 	fi
 
-	# to make our lives easier (and saner), we do the fix_libtool stuff here.
-	# rather than checking SLOT's and trying in upgrade paths, we just see if
-	# the common libstdc++.la exists in the ${LIBPATH} of the gcc that we are
-	# unmerging.  if it does, that means this was a simple re-emerge.
-
 	# clean up the cruft left behind by cross-compilers
 	if is_crosscompile ; then
 		if [[ -z $(ls "${EROOT%/}"/etc/env.d/gcc/${CTARGET}* 2>/dev/null) ]] ; then

diff --git a/sys-devel/gcc/files/c89 b/sys-devel/gcc/files/c89
deleted file mode 100644
index cee0325f50f..00000000000
--- a/sys-devel/gcc/files/c89
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-2.95):
-# 	-ansi
-# 	-std=c89
-# 	-std=iso9899:1990
-
-for i; do
-    case "$i" in
-	-ansi|-std=c89|-std=iso9899:1990)
-	    ;;
-	-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C90 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c89 -pedantic -U_FORTIFY_SOURCE "$@"

diff --git a/sys-devel/gcc/files/c99 b/sys-devel/gcc/files/c99
deleted file mode 100644
index c9542095e38..00000000000
--- a/sys-devel/gcc/files/c99
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh
-
-# Call the appropriate C compiler with options to accept ANSI/ISO C
-# The following options are the same (as of gcc-3.3):
-# 	-std=c99
-# 	-std=c9x
-# 	-std=iso9899:1999
-# 	-std=iso9899:199x
-
-for i; do
-    case "$i" in
-	-std=c9[9x]|-std=iso9899:199[9x])
-	    ;;
-	-ansi|-std=*)
-	    echo >&2 "`basename $0` called with non ANSI/ISO C99 option $i"
-	    exit 1
-	    ;;
-    esac
-done
-
-exec gcc -std=c99 -pedantic -U_FORTIFY_SOURCE ${1+"$@"}