[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2023-04-22 Thread Sam James 
commit: 8db9b4cf4a1f931e5d371fafe588eb28ccea1a60
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 22 12:07:55 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 22 12:07:55 2023 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=8db9b4cf

sys-devel/gcc-config: keyword ~x64-macos

Bug: https://bugs.gentoo.org/904474
Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc-config/gcc-config-1.9.1.ebuild  | 2 +-
 sys-devel/gcc-config/gcc-config-2.7-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
index a68eabd9da..00fb6ac4f9 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]]; then
 else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz;
-   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="Utility to manage compilers"

diff --git a/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild 
b/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
index 94cc8b75cf..4a5a07ff92 100644
--- a/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
 else

SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz;
-   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos 
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="Utility to manage compilers"

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/files/

2022-11-06 Thread Fabian Groffen 
commit: a6a3bd3ef1f8235e923c7e5fd5cc54bc29d14721
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Nov  6 11:33:54 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Nov  6 11:33:54 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=a6a3bd3e

sys-devel/gcc-config: use version_sorted_paths iso sort -V

Oversight on my part, just use the version_sorted_paths function which
may use sort -V in the future, but for now is the way to order the
versions (which works fine)

Signed-off-by: Fabian Groffen  gentoo.org>

 .../gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch 
b/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch
index e15e83015f..63494e4813 100644
--- a/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch
+++ b/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch
@@ -6,19 +6,15 @@ with older binaries.
 
 --- gcc-config-2.7/gcc-config
 +++ gcc-config-2.7/gcc-config
-@@ -619,8 +619,13 @@
+@@ -619,8 +619,9 @@
rmdir "${sourcedir}"
}
  
 -  # We don't rely on iteration order here.
 -  local GCC_PROFILES=$(LC_ALL="C" ls ${GCC_ENV_D}/${CHOST}-*)
 +  # We want the latest version to provide the final link to an object,
-+  # for gcc's libs should be backwards compatible, so use sort -V to
-+  # get that ordering -- take into account that sort may not support
-+  # -V (yet).  Then it is better to just do whatever order ls reports.
-+  local srt='sort --version-sort'
-+  sort --help | grep -q -- --version-sort || srt='cat'
-+  local GCC_PROFILES=$(LC_ALL="C" ls ${GCC_ENV_D}/${CHOST}-* | ${srt})
++  # for gcc's libs should be backwards compatible
++  local GCC_PROFILES=$(version_sorted_paths ${GCC_ENV_D}/${CHOST}-*)
  
local targetdirs= GCC_PATH= LDPATH=
for x in ${GCC_PROFILES} ; do

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/, sys-devel/binutils-config/, sys-devel/gcc-config/files/, ...

2022-11-05 Thread Fabian Groffen 
commit: 0bf8c2d99027d3173fc0ead689be6ce9347d9d9d
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov  5 15:49:18 2022 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov  5 15:49:18 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0bf8c2d9

sys-devel/gcc-config-2.7-r1: add patch for order of GCC libs

This ensures that most recent GCC libs are used for the backup GCC
libaries.

Signed-off-by: Fabian Groffen  gentoo.org>

 ...5.1-r4.ebuild => binutils-config-5.1-r5.ebuild} |  0
 sys-devel/binutils-config/files/ldwrapper.c|  1 +
 .../files/gcc-config-2.7-gcc-libs-ordered.patch| 24 ++
 ...-config-2.7.ebuild => gcc-config-2.7-r1.ebuild} |  1 +
 sys-devel/gcc/gcc-12.2.0.ebuild|  3 ++-
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/sys-devel/binutils-config/binutils-config-5.1-r4.ebuild 
b/sys-devel/binutils-config/binutils-config-5.1-r5.ebuild
similarity index 100%
rename from sys-devel/binutils-config/binutils-config-5.1-r4.ebuild
rename to sys-devel/binutils-config/binutils-config-5.1-r5.ebuild

diff --git a/sys-devel/binutils-config/files/ldwrapper.c 
b/sys-devel/binutils-config/files/ldwrapper.c
index 6bcb2a5e72..1b5fa19ad3 100644
--- a/sys-devel/binutils-config/files/ldwrapper.c
+++ b/sys-devel/binutils-config/files/ldwrapper.c
@@ -461,6 +461,7 @@ main(int argc, char *argv[])
if (!is_cross) {
if (is_darwin) {
/* FIXME: no support for cross-compiling *to* Darwin */
+   newargv[k++] = "-L" EPREFIX "/usr/" CHOST "/lib/gcc";
newargv[k++] = "-L" EPREFIX "/usr/lib";
newargv[k++] = "-L" EPREFIX "/lib";
 

diff --git a/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch 
b/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch
new file mode 100644
index 00..e15e83015f
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-2.7-gcc-libs-ordered.patch
@@ -0,0 +1,24 @@
+prefix_copy_gcc_libs: try and get latest libs copied last
+
+Try to get the most recent GCC libs copied to the shared place.  We need
+the latest because they should be backwards compatible, thus also work
+with older binaries.
+
+--- gcc-config-2.7/gcc-config
 gcc-config-2.7/gcc-config
+@@ -619,8 +619,13 @@
+   rmdir "${sourcedir}"
+   }
+ 
+-  # We don't rely on iteration order here.
+-  local GCC_PROFILES=$(LC_ALL="C" ls ${GCC_ENV_D}/${CHOST}-*)
++  # We want the latest version to provide the final link to an object,
++  # for gcc's libs should be backwards compatible, so use sort -V to
++  # get that ordering -- take into account that sort may not support
++  # -V (yet).  Then it is better to just do whatever order ls reports.
++  local srt='sort --version-sort'
++  sort --help | grep -q -- --version-sort || srt='cat'
++  local GCC_PROFILES=$(LC_ALL="C" ls ${GCC_ENV_D}/${CHOST}-* | ${srt})
+ 
+   local targetdirs= GCC_PATH= LDPATH=
+   for x in ${GCC_PROFILES} ; do

diff --git a/sys-devel/gcc-config/gcc-config-2.7.ebuild 
b/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
similarity index 97%
rename from sys-devel/gcc-config/gcc-config-2.7.ebuild
rename to sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
index a1ecb1a2b2..94cc8b75cf 100644
--- a/sys-devel/gcc-config/gcc-config-2.7.ebuild
+++ b/sys-devel/gcc-config/gcc-config-2.7-r1.ebuild
@@ -23,6 +23,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}-2.7-gcc-libs-ordered.patch
 )
 
 _emake() {

diff --git a/sys-devel/gcc/gcc-12.2.0.ebuild b/sys-devel/gcc/gcc-12.2.0.ebuild
index 1cb1b0da53..59b639d041 100644
--- a/sys-devel/gcc/gcc-12.2.0.ebuild
+++ b/sys-devel/gcc/gcc-12.2.0.ebuild
@@ -13,8 +13,9 @@ inherit toolchain
 
 # Don't keyword live ebuilds
 if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
-# fails to compile on Solaris and macOS, need to check why
+   # fails to compile on Solaris and macOS, need to check why
: KEYWORDS="~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+   KEYWORDS="~x64-macos"
 fi
 
 # use alternate source for Apple M1 (also works for x86_64)

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2022-10-08 Thread Sam James 
commit: 67d6c543a652d4c6444bf82a1469c5c68b6f2510
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  8 22:06:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  8 22:16:42 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=67d6c543

sys-devel/gcc-config: add 2.7, drop 2.6

Closes: https://bugs.gentoo.org/875377
Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc-config/Manifest | 2 +-
 sys-devel/gcc-config/{gcc-config-2.6.ebuild => gcc-config-2.7.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 92badc05ec..b2d279aa1a 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,2 +1,2 @@
 DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 
8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee
 SHA512 
6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069
-DIST gcc-config-2.6.tar.xz 17772 BLAKE2B 
5f06ac46c64fd241be9e7b95e277395623f015016c5abbe5e3275dce3fbf326d998a897a915b87387c878a1b57cdc847a6f95fa0b7ca00aa954c13d00a6e7d09
 SHA512 
27de726b266b2f58f28a4eab0a77141a8c0cfc9e939f4f0ee8dd382578a1cdececd30a4ae15bab858fec01a533c41248c9858f25d5d7314c36e8f2fcd57df429
+DIST gcc-config-2.7.tar.xz 17916 BLAKE2B 
4c775ad64648e9b463981f43ff03f0c5b703c7cb0812f3a4579fdc939630b8d91d0b1d8a9bb56e47098155be492452698907c9640f0accd5e2141dc49216093d
 SHA512 
69888798257ea6a9c16e387b3cee872ad47aa891f191ef6fbbbf18df243fba649505799c9cad57474f34720ff8892d8f21c96b69d5d6279efe0c7ee79a9ca8b3

diff --git a/sys-devel/gcc-config/gcc-config-2.6.ebuild 
b/sys-devel/gcc-config/gcc-config-2.7.ebuild
similarity index 100%
rename from sys-devel/gcc-config/gcc-config-2.6.ebuild
rename to sys-devel/gcc-config/gcc-config-2.7.ebuild

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2022-10-02 Thread Sam James 
commit: feb8ef855dec1c641c3d949ec11cc830c7e92e36
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  3 04:18:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  3 04:18:20 2022 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=feb8ef85

sys-devel/gcc-config: add 2.6

Signed-off-by: Sam James  gentoo.org>

 sys-devel/gcc-config/Manifest  |  1 +
 sys-devel/gcc-config/gcc-config-2.6.ebuild | 65 ++
 2 files changed, 66 insertions(+)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 5045afbd82..92badc05ec 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1 +1,2 @@
 DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 
8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee
 SHA512 
6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069
+DIST gcc-config-2.6.tar.xz 17772 BLAKE2B 
5f06ac46c64fd241be9e7b95e277395623f015016c5abbe5e3275dce3fbf326d998a897a915b87387c878a1b57cdc847a6f95fa0b7ca00aa954c13d00a6e7d09
 SHA512 
27de726b266b2f58f28a4eab0a77141a8c0cfc9e939f4f0ee8dd382578a1cdececd30a4ae15bab858fec01a533c41248c9858f25d5d7314c36e8f2fcd57df429

diff --git a/sys-devel/gcc-config/gcc-config-2.6.ebuild 
b/sys-devel/gcc-config/gcc-config-2.6.ebuild
new file mode 100644
index 00..a1ecb1a2b2
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} ==  ]]; 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="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+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"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8-copy-gcc-libs-darwin.patch
+   "${FILESDIR}"/${PN}-1.9-cygwin.patch
+)
+
+_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
+}

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2021-01-06 Thread Fabian Groffen 
commit: 57642124f4858d9654eb6cd1df792d01b9919562
Author: Fabian Groffen  gentoo  org>
AuthorDate: Wed Jan  6 12:00:38 2021 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Wed Jan  6 12:00:38 2021 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=57642124

sys-devel/gcc-config: drop x86-macos

Package-Manager: Portage-3.0.12.0.2-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-config/gcc-config-1.9.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
index 5abfbe9515..a68eabd9da 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]]; then
 else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz;
-   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="Utility to manage compilers"

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2020-12-27 Thread Fabian Groffen 
commit: 9eebf5e0689f10fd3701dfab496b96688ac2ca51
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sun Dec 27 11:23:51 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sun Dec 27 11:23:51 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=9eebf5e0

sys-devel/gcc-config: drop ~m68k-mint

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-config/gcc-config-1.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
index 882e22efa4..5abfbe9515 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]]; then
 else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz;
-   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
+   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="Utility to manage compilers"

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2020-12-22 Thread Fabian Groffen 
commit: 8344921404b56c23c11839c8fdb3e3cd12de510c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Tue Dec 22 21:17:57 2020 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Tue Dec 22 21:17:57 2020 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=83449214

sys-devel/gcc-config: drop ~ppc-aix

Bug: https://bugs.gentoo.org/760057
Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-config/gcc-config-1.9.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
index 3605471f2d..882e22efa4 100644
--- a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} ==  ]]; then
 else
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz;
-   KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
+   KEYWORDS="~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
 fi
 
 DESCRIPTION="Utility to manage compilers"

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/

2019-05-30 Thread Fabian Groffen 
commit: d8c9f4611146c1e16b1aa795b8e599c56386a1a9
Author: Fabian Groffen  gentoo  org>
AuthorDate: Thu May 30 09:14:28 2019 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Thu May 30 09:14:28 2019 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d8c9f461

sys-devel/gcc-config: remove interrevision

Package-Manager: Portage-2.3.62-prefix, Repoman-2.3.13
Signed-off-by: Fabian Groffen  gentoo.org>

 sys-devel/gcc-config/Manifest  |  1 -
 sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild | 54 --
 2 files changed, 55 deletions(-)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 3a3f29ce03..5045afbd82 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,2 +1 @@
-DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 
3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734
 SHA512 
658c8ce26f6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
 DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 
8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee
 SHA512 
6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069

diff --git a/sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild
deleted file mode 100644
index 2cbd590dc7..00
--- a/sys-devel/gcc-config/gcc-config-1.9.0-r00.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 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="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris 
~x86-winnt"
-IUSE=""
-
-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() {
-   emake EPREFIX="${EPREFIX}" CC="$(tc-getCC)"
-}
-
-src_install() {
-   emake \
-   EPREFIX="${EPREFIX}" \
-   DESTDIR="${D}" \
-   PV="${PV}" \
-   SUBLIBDIR="$(get_libdir)" \
-   install
-}
-
-pkg_postinst() {
-   # Scrub eselect-compiler remains
-   rm -f "${EROOT}"/etc/env.d/05compiler &
-
-   # We not longer use the /usr/include/g++-v3 hacks, as
-   # it is not needed ...
-   rm -f "${EROOT}"/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
-}

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/, sys-devel/gcc-config/files/

2018-01-19 Thread Michael Haubenwallner 
commit: 7c116df5b34e6e8f1ae9c2121b1f01d02bb978ff
Author: Michael Haubenwallner  gentoo  org>
AuthorDate: Fri Jan 19 10:44:30 2018 +
Commit: Michael Haubenwallner  gentoo  org>
CommitDate: Fri Jan 19 10:44:30 2018 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=7c116df5

sys-devel/gcc-config: sync, use /usr/bin/env bash

For prefix-chaining there eventually is no EPREFIX/bin/bash, so we need
to /usr/bin/env bash instead.

Package-Manager: Portage-2.3.18-prefix, Repoman-2.3.6

 sys-devel/gcc-config/Manifest  |  1 +
 .../files/gcc-config-1.9-usrbinenv-bash.patch  | 18 +++
 sys-devel/gcc-config/gcc-config-1.9.1.ebuild   | 62 ++
 3 files changed, 81 insertions(+)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index ccd59688f9..3a3f29ce03 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1 +1,2 @@
 DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 
3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734
 SHA512 
658c8ce26f6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
+DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 
8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee
 SHA512 
6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069

diff --git a/sys-devel/gcc-config/files/gcc-config-1.9-usrbinenv-bash.patch 
b/sys-devel/gcc-config/files/gcc-config-1.9-usrbinenv-bash.patch
new file mode 100644
index 00..5df08b42f6
--- /dev/null
+++ b/sys-devel/gcc-config/files/gcc-config-1.9-usrbinenv-bash.patch
@@ -0,0 +1,18 @@
+--- gcc-config-1.9.0/gcc-config
 gcc-config-1.9.0/gcc-config
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+ # Copyright 1999-2012 Gentoo Foundation
+ # Distributed under the terms of the GNU General Public License v2
+ 
+--- gcc-config-1.9.1/Makefile
 gcc-config-1.9.1/Makefile
+@@ -26,7 +26,6 @@
+ 
+ .gcc-config: gcc-config
+   sed \
+-  -e '1s:/:$(EPREFIX)/:' \
+   -e 's:@GENTOO_EPREFIX@:$(EPREFIX):g' \
+   -e 's:@GENTOO_LIBDIR@:$(SUBLIBDIR):g' \
+   -e 's:@PV@:$(PV):g' \

diff --git a/sys-devel/gcc-config/gcc-config-1.9.1.ebuild 
b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
new file mode 100644
index 00..3605471f2d
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-1.9.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+if [[ ${PV} ==  ]]; 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="~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos 
~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris ~x86-winnt"
+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"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.8-copy-gcc-libs-darwin.patch
+   "${FILESDIR}"/${PN}-1.9-cygwin.patch
+   "${FILESDIR}"/${PN}-1.9-usrbinenv-bash.patch
+)
+
+src_compile() {
+   emake CC="$(tc-getCC)" \
+   EPREFIX="${EPREFIX}" \
+   PV="${PV}" \
+   SUBLIBDIR="$(get_libdir)"
+}
+
+src_install() {
+   emake \
+   EPREFIX="${EPREFIX}" \
+   DESTDIR="${D}" \
+   PV="${PV}" \
+   SUBLIBDIR="$(get_libdir)" \
+   install
+}
+
+pkg_postinst() {
+   # Scrub eselect-compiler remains
+   rm -f "${EROOT}"/etc/env.d/05compiler &
+
+   # We not longer use the /usr/include/g++-v3 hacks, as
+   # it is not needed ...
+   rm -f "${EROOT}"/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
+}

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/files/, sys-devel/gcc-config/

2017-12-15 Thread Fabian Groffen 
commit: 21144b9564499c9a5214402d50c5fe5eea464479
Author: Fabian Groffen  gentoo  org>
AuthorDate: Fri Dec 15 08:47:13 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Fri Dec 15 08:47:13 2017 +
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 00..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 
+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() {

[gentoo-commits] repo/proj/prefix:master commit in: sys-devel/gcc-config/, sys-devel/gcc-config/files/

2017-11-25 Thread Fabian Groffen 
commit: 03f39731a884d2b38f60e3ed44f93c0a3529240c
Author: Fabian Groffen  gentoo  org>
AuthorDate: Sat Nov 25 19:45:56 2017 +
Commit: Fabian Groffen  gentoo  org>
CommitDate: Sat Nov 25 19:45:56 2017 +
URL:https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=03f39731

sys-devel/gcc-config: sync

Package-Manager: Portage-2.3.13-prefix, Repoman-2.3.4

 sys-devel/gcc-config/Manifest  |2 +-
 sys-devel/gcc-config/files/gcc-config-1.5  | 1054 
 .../gcc-config-1.8-copy-gcc-libs-darwin.patch  |4 +-
 .../files/gcc-config-1.8-copy-gcc-libs.patch   |  212 
 ...8-dont_source_functions_sh_from_etc_initd.patch |   47 -
 8-cygwin.patch => gcc-config-1.9-cygwin.patch} |   14 +-
 .../files/gcc-config-prefix-1.8-r221-r1.patch  |  342 ---
 .../files/gcc-config-prefix-1.8-r221.patch |  344 ---
 sys-devel/gcc-config/gcc-config-1.5-r2.ebuild  |   65 --
 sys-devel/gcc-config/gcc-config-1.8-r00.1.ebuild   |   59 --
 sys-devel/gcc-config/gcc-config-1.8-r01.1.ebuild   |   62 --
 ...onfig-1.8-r1.ebuild => gcc-config-1.9.0.ebuild} |   34 +-
 12 files changed, 23 insertions(+), 2216 deletions(-)

diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 6776ccd9a6..2a177c0f99 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1 +1 @@
-DIST gcc-config-1.8.tar.xz 15020 SHA256 
2453e2a07521b12267ca62b9b860eb2d2bc606cad0f29bf42a1c9543673f5a1b SHA512 
3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
 WHIRLPOOL 
4899bc1da43a158cc486022f68661e5318db7e4e83afdb5d892fc7ce5098a4bdb059dbab3c50e632901e577cd8760b2386da3ee24f5e944db12d3e246d9c26b6
+DIST gcc-config-1.9.0.tar.xz 17468 SHA256 
3e0acf3fe683dc6193b0135fe4b26ce7f959210296fff040a10bccc33a247d1a SHA512 
658c8ce26f6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
 WHIRLPOOL 
ed341f1fa72958008d4e1c1a814a2cf025be7404d21c963c6b82c36dc951ba15849f7809211fb21e5fb4a18ce5c12f4f4b36242822e568d4b4f39a8f9f26aa0a

diff --git a/sys-devel/gcc-config/files/gcc-config-1.5 
b/sys-devel/gcc-config/files/gcc-config-1.5
deleted file mode 100755
index 6b7d1a102f..00
--- a/sys-devel/gcc-config/files/gcc-config-1.5
+++ /dev/null
@@ -1,1054 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc-config/files/gcc-config-1.5,v 
1.7 2011/12/07 05:42:19 vapier Exp $
-
-# Format of /etc/env.d/gcc/:
-#  config-TARGET:  CURRENT=version for TARGET
-#  TARGET-VER: has a TARGET and VER variable
-
-: ${ROOT:=/}
-[[ ${ROOT} != */ ]] && ROOT="${ROOT}/"
-[[ ${ROOT} != /* ]] && ROOT="${PWD}${ROOT}"
-EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
-EROOT="${ROOT%/}${EPREFIX}/"
-
-cd /
-
-trap ":" INT QUIT TSTP
-
-argv0=${0##*/}
-source "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh || {
-   echo "${argv0}: Could not source 
@GENTOO_PORTAGE_EPREFIX@/etc/init.d/functions.sh!" 1>&2
-   exit 1
-}
-esyslog() { :; }
-umask 022
-
-die_eerror() {
-   eerror "${argv0}: $*"
-   exit 1
-}
-
-# *BSD are plain stupid ... copy a GNU extension but don't just copy it,
-# change it so it works differently.  Wish Darwin did selective evolution
-# on software developers.
-SED=$(type -P gsed)
-: ${SED:=$(type -P sed)}
-
-# Further pain: `tac` is not available everywhere #390179
-if ! type -P tac >/dev/null ; then
-   tac() { ${SED} -e '1!G;h;$!d' "$@" ; }
-fi
-
-GENTOO_LIBDIR="@GENTOO_LIBDIR@"
-[[ ${GENTOO_LIBDIR} == @*@ ]] && GENTOO_LIBDIR="lib"
-
-usage() {
-cat << "USAGE_END"
-Usage: gcc-config [options] [CC Profile]
-Change the current cc/gcc profile, or give info about profiles.
-
-Options:
-  -C, --nocolor  Disable color output
-  -O, --use-old  Use the old profile if one was selected.
-  -f, --forceMake sure all config files are regenerated.
-  -P, --use-portage-chostOnly set to given profile if its CHOST is the
- same as that set in /etc/portage/make.conf
- (or one of other portage config files...).
-  -c, --get-current-profile  Print current used gcc profile.
-  -l, --list-profilesPrint a list of available profiles.
-  -S, --split-profileSplit profiles into their components
-  -E, --print-environPrint environment that can be used to setup the
- current gcc profile, or a specified one.
-  -B, --get-bin-path Print path where binaries of the given/current
- profile are located.
-  -L, --get-lib-path Print path where libraries of the given/current
- profile are located.
-
-Profile names are of the form:  -
-For example: