commit: 21144b9564499c9a5214402d50c5fe5eea464479 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Fri Dec 15 08:47:13 2017 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Fri Dec 15 08:47:13 2017 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=21144b95
sys-devel/gcc-config: add patch to re-enable env-update for prefix, bug #641096 Closes: https://bugs.gentoo.org/641096 Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6 ...config-1.9.0-ensure-env-update-for-prefix.patch | 46 ++++++++++++++++++++++ ...-1.9.0.ebuild => gcc-config-1.9.0-r00.1.ebuild} | 1 + 2 files changed, 47 insertions(+) diff --git a/sys-devel/gcc-config/files/gcc-config-1.9.0-ensure-env-update-for-prefix.patch b/sys-devel/gcc-config/files/gcc-config-1.9.0-ensure-env-update-for-prefix.patch new file mode 100644 index 0000000000..744d8a1bc3 --- /dev/null +++ b/sys-devel/gcc-config/files/gcc-config-1.9.0-ensure-env-update-for-prefix.patch @@ -0,0 +1,46 @@ +From 748d20380aa1b27149dc1b80c7eaf15fde7c6aba Mon Sep 17 00:00:00 2001 +From: Fabian Groffen <[email protected]> +Date: Fri, 15 Dec 2017 09:30:17 +0100 +Subject: gcc-config: ensure we run env-update for prefix too + +The intention of commit cfbb9e94ca23c360d5801946e39da29c7d422dfc was to +disable running ldconfig and updating ld.so.conf for prefix, but the +implementation was too greedy and also disabled env-update, which we +need to activate a compiler, see bug #641096. + +Bug: https://bugs.gentoo.org/641096 +--- + gcc-config | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/gcc-config b/gcc-config +index 7fcde15..ff8d8ac 100755 +--- a/gcc-config ++++ b/gcc-config +@@ -693,16 +693,18 @@ switch_profile() { + [[ ${FORCE} == "yes" || ${envd_changed} -gt 0 ]] + then + # in case python is broken ... +- if [[ -z ${EPREFIX} ]] && ! env-update ; then ++ if ! env-update ; then + echo "" + ewarn "env-update failed to work properly; making sure ld.so.conf paths" + ewarn "are setup properly. Please rerun gcc-config with the -f option." + echo "" +- if [[ ! -d /etc/ld.so.conf.d ]] ; then +- show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ +- | ${SED} -e 's|:|\n|g' >> /etc/ld.so.conf ++ if [[ -z ${EPREFIX} ]] ; then ++ if [[ ! -d /etc/ld.so.conf.d ]] ; then ++ show_var LDPATH "${ROOT}"/etc/env.d/05gcc-${CTARGET} \ ++ | ${SED} -e 's|:|\n|g' >> /etc/ld.so.conf ++ fi ++ ldconfig + fi +- ldconfig + fi + else + envd_changed=0 +-- +cgit v1.1 + diff --git a/sys-devel/gcc-config/gcc-config-1.9.0.ebuild b/sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild similarity index 95% rename from sys-devel/gcc-config/gcc-config-1.9.0.ebuild rename to sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild index 6c39598837..2cbd590dc7 100644 --- a/sys-devel/gcc-config/gcc-config-1.9.0.ebuild +++ b/sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild @@ -20,6 +20,7 @@ RDEPEND=">=sys-apps/gentoo-functions-0.10" PATCHES=( "${FILESDIR}"/${PN}-1.8-copy-gcc-libs-darwin.patch "${FILESDIR}"/${PN}-1.9-cygwin.patch + "${FILESDIR}"/${PN}-1.9.0-ensure-env-update-for-prefix.patch ) src_compile() {
