sys-devel/gcc-config: update to 2.5

Update sys-devel/gcc-config to 2.5, as it is recommended by the new
gcc 10.
This commit is contained in:
Dongsu Park 2022-02-02 14:41:40 +01:00
parent b33a5992fc
commit 39b4a30b46
9 changed files with 153 additions and 234 deletions

View File

@ -1,4 +1,2 @@
DIST gcc-config-1.8.tar.xz 15020 BLAKE2B 97debbef946b0c14b4ecc0bc5b2217566b43f21318970b235b2919bd1e1ea41aff66aebb0ed73db2382f8312268327eb6844139bdeae7aba75771c699a5043df SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734 SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee SHA512 6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069
DIST gcc-config-2.0.tar.xz 15344 BLAKE2B 323b1e791b831ee610a375fc03532ab89e31b1f74586742c1d37dcea9c7853cf4ebfef875fc2bfa273cfc1555a33b9f04a1e58c850133cddee765dd769bdb189 SHA512 67c8cfc7e031d4a88191c04495c97f46e90e2d3fce4cd1afc29f142fad9414218768d3c6de4bd8bb7d9baa39a20b17bb28a503b0d05d6db2003b767546317a30
DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83

View File

@ -1,47 +0,0 @@
--- gcc-config-1.8/gcc-config
+++ gcc-config-1.8/gcc-config
@@ -15,8 +15,9 @@
trap ":" INT QUIT TSTP
argv0=${0##*/}
-source /etc/init.d/functions.sh || {
- echo "${argv0}: Could not source /etc/init.d/functions.sh!" 1>&2
+functions_script="/lib/gentoo/functions.sh"
+source ${functions_script} || {
+ echo "${argv0}: Could not source ${functions_script}!" 1>&2
exit 1
}
esyslog() { :; }
From d45de09450ffb63b138bbb7f78cae43e1101e2ec Mon Sep 17 00:00:00 2001
From: Ryan Hill <rhill@gentoo.org>
Date: Tue, 12 May 2015 22:09:28 -0600
Subject: [PATCH] Ignore whitespace when diffing test results.
The amount of whitespace output by ebegin/eend from gentoo-functions
is dynamic (seems to be dependent on terminal width). Since we can't
predict this we have to ignore all whitespace differences.
URL: https://bugs.gentoo.org/547586
Reported-by: tka <tka@kamph.org>
Signed-off-by: Ryan Hill <rhill@gentoo.org>
---
tests/run_tests | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/run_tests b/tests/run_tests
index 2ff7d77..397d667 100755
--- a/tests/run_tests
+++ b/tests/run_tests
@@ -44,7 +44,7 @@ cmp_log() {
args+=( -e "s|: line [0-9]*: |: |g" )
sed "${args[@]}" "${exp}" > "${exp}.tmp"
sed "${args[@]}" "${log}" > "${log}.tmp"
- diff -u "${exp}.tmp" "${log}.tmp" > "${log}.diff"
+ diff -uw "${exp}.tmp" "${log}.tmp" > "${log}.diff"
ret=$?
rm "${exp}.tmp"
return ${ret}
--
2.4.4

View File

@ -1,51 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils unpacker toolchain-funcs multilib
DESCRIPTION="utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=sys-apps/gentoo-functions-0.10"
src_prepare() {
epatch "${FILESDIR}/${PN}-1.8-dont_source_functions_sh_from_etc_initd.patch" # 504118
}
src_compile() {
emake CC="$(tc-getCC)"
}
src_install() {
emake \
DESTDIR="${D}" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)" \
install
}
pkg_postinst() {
# Scrub eselect-compiler remains
rm -f "${ROOT}"/etc/env.d/05compiler &
# We not longer use the /usr/include/g++-v3 hacks, as
# it is not needed ...
rm -f "${ROOT}"/usr/include/g++{,-v3} &
# Do we have a valid multi ver setup ?
local x
for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
gcc-config ${x}
done
wait
}

View File

@ -1,49 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit eutils toolchain-funcs multilib
DESCRIPTION="Utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
IUSE=""
RDEPEND=">=sys-apps/gentoo-functions-0.10"
src_compile() {
emake CC="$(tc-getCC)" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)"
}
src_install() {
emake \
DESTDIR="${D}" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)" \
install
}
pkg_postinst() {
# Scrub eselect-compiler remains
rm -f "${ROOT}"/etc/env.d/05compiler &
# We not longer use the /usr/include/g++-v3 hacks, as
# it is not needed ...
rm -f "${ROOT}"/usr/include/g++{,-v3} &
# Do we have a valid multi ver setup ?
local x
for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
gcc-config ${x}
done
wait
}

View File

@ -1,54 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
inherit git-r3
else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
fi
DESCRIPTION="Utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
RDEPEND=">=sys-apps/gentoo-functions-0.10"
src_compile() {
emake CC="$(tc-getCC)" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)"
}
src_install() {
emake \
DESTDIR="${D}" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)" \
install
}
pkg_postinst() {
# Scrub eselect-compiler remains
rm -f "${ROOT}"/etc/env.d/05compiler &
# We not longer use the /usr/include/g++-v3 hacks, as
# it is not needed ...
rm -f "${ROOT}"/usr/include/g++{,-v3} &
# Do we have a valid multi ver setup ?
local x
for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
gcc-config ${x}
done
wait
}

View File

@ -0,0 +1,52 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
LICENSE="GPL-2"
SLOT="0"
IUSE="+cc-wrappers +native-symlinks"
RDEPEND=">=sys-apps/gentoo-functions-0.10"
_emake() {
emake \
PV="${PVR}" \
SUBLIBDIR="$(get_libdir)" \
USE_CC_WRAPPERS="$(usex cc-wrappers)" \
USE_NATIVE_LINKS="$(usex native-symlinks)" \
TOOLCHAIN_PREFIX="${CHOST}-" \
"$@"
}
src_compile() {
_emake
}
src_install() {
_emake DESTDIR="${D}" install
}
pkg_postinst() {
# Do we have a valid multi ver setup ?
local x
for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
gcc-config ${x}
done
# USE flag change can add or delete files in /usr/bin worth recaching
if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
eselect compiler-shadow update all
fi
}

View File

@ -0,0 +1,60 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
inherit git-r3
else
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
DESCRIPTION="Utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
LICENSE="GPL-2"
SLOT="0"
IUSE="+cc-wrappers +native-symlinks"
RDEPEND=">=sys-apps/gentoo-functions-0.10"
_emake() {
emake \
PV="${PVR}" \
SUBLIBDIR="$(get_libdir)" \
USE_CC_WRAPPERS="$(usex cc-wrappers)" \
USE_NATIVE_LINKS="$(usex native-symlinks)" \
TOOLCHAIN_PREFIX="${CHOST}-" \
"$@"
}
src_compile() {
_emake
}
src_install() {
_emake DESTDIR="${D}" install
}
pkg_postinst() {
# Do we have a valid multi ver setup ?
local x
for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
gcc-config ${x}
done
# USE flag change can add or delete files in /usr/bin worth recaching
if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
eselect compiler-shadow update all
fi
if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
# Warn about obsolete /usr/bin/gcj for bug #804178
ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
ewarn "If you have no idea what this means, please delete the file:"
ewarn " rm ${EROOT}/usr/bin/gcj"
fi
}

View File

@ -1,54 +1,60 @@
# Copyright 1999-2018 Gentoo Foundation
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit toolchain-funcs
EAPI=7
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
inherit git-r3
else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="Utility to manage compilers"
HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
LICENSE="GPL-2"
SLOT="0"
IUSE=""
IUSE="+cc-wrappers +native-symlinks"
RDEPEND=">=sys-apps/gentoo-functions-0.10"
_emake() {
emake \
PV="${PVR}" \
SUBLIBDIR="$(get_libdir)" \
USE_CC_WRAPPERS="$(usex cc-wrappers)" \
USE_NATIVE_LINKS="$(usex native-symlinks)" \
TOOLCHAIN_PREFIX="${CHOST}-" \
"$@"
}
src_compile() {
emake CC="$(tc-getCC)" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)"
_emake
}
src_install() {
emake \
DESTDIR="${D}" \
PV="${PV}" \
SUBLIBDIR="$(get_libdir)" \
install
_emake DESTDIR="${D}" install
}
pkg_postinst() {
# Scrub eselect-compiler remains
rm -f "${ROOT}"/etc/env.d/05compiler &
# We not longer use the /usr/include/g++-v3 hacks, as
# it is not needed ...
rm -f "${ROOT}"/usr/include/g++{,-v3} &
# Do we have a valid multi ver setup ?
local x
for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
gcc-config ${x}
done
wait
# USE flag change can add or delete files in /usr/bin worth recaching
if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
eselect compiler-shadow update all
fi
if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
# Warn about obsolete /usr/bin/gcj for bug #804178
ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
ewarn "If you have no idea what this means, please delete the file:"
ewarn " rm ${EROOT}/usr/bin/gcj"
fi
}

View File

@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
<maintainer type="project">
<email>toolchain@gentoo.org</email>
<name>Gentoo Toolchain Project</name>
</maintainer>
<use>
<flag name="cc-wrappers">Install and manage 'cc' and 'f77' wrappers in /usr/bin. Otherwise ignore them.</flag>
<flag name="native-symlinks">Install native symlinks like 'gcc' or 'g++' to /usr/bin. Otherwise keep only ${CTARGET}-gcc and friends.</flag>
</use>
</pkgmetadata>