commit: 9841d1b2fda2865dc9e36a8b4402cc5d9338744c Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Sun Sep 8 22:17:21 2019 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Thu Sep 12 03:24:44 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9841d1b2
sys-devel/gnuconfig: rebase onto latest upstream git Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> .../0001-add-ps2-targets-to-config.sub.patch | 64 ++++++++++++++++++++++ .../0002-Add-x32-support-to-config.guess.patch | 18 +++--- .../0002-add-ps2-targets-to-config.sub.patch | 59 -------------------- sys-devel/gnuconfig/gnuconfig-99999999.ebuild | 9 +-- 4 files changed, 78 insertions(+), 72 deletions(-) diff --git a/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch new file mode 100644 index 00000000000..83c259b2b1e --- /dev/null +++ b/sys-devel/gnuconfig/files/99999999/0001-add-ps2-targets-to-config.sub.patch @@ -0,0 +1,64 @@ +From d5899b457d3215db991761e57aa4e091e4b24f28 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger <vap...@gentoo.org> +Date: Thu, 9 Oct 2008 15:51:35 -0400 +Subject: [PATCH] add ps2 targets to config.sub + +We no longer carry the "ps2" target as that conflicts with the long +standing shortcut for the i386-ibm-aix target. +--- + config.sub | 25 +++++++++++++++++++++++-- + 1 file changed, 23 insertions(+), 2 deletions(-) + +diff --git a/config.sub b/config.sub +index a318a4686850..837d23369163 100755 +--- a/config.sub ++++ b/config.sub +@@ -810,6 +810,27 @@ case $basic_machine in + vendor=atari + os=mint + ;; ++ mipsEE* | ee) ++ cpu=mips64r5900el ++ vendor=scei ++ case $os in ++ linux*) ++ ;; ++ *) ++ os=elf ++ ;; ++ esac ++ ;; ++ iop) ++ cpu=mipsel ++ vendor=scei ++ os=irx ++ ;; ++ dvp) ++ cpu=dvp ++ vendor=scei ++ os=elf ++ ;; + news-3600 | risc-news) + cpu=mips + vendor=sony +@@ -1172,7 +1193,7 @@ case $cpu-$vendor in + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ +- | d10v | d30v | dlx | dsp16xx \ ++ | d10v | d30v | dlx | dsp16xx | dvp \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ +@@ -1359,7 +1380,7 @@ case $os in + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ +- | storm-chaos* | tops10* | tenex* | tops20* | its* \ ++ | storm-chaos* | tops10* | tenex* | tops20* | its* | irx* \ + | os2* | vos* | palmos* | uclinux* | nucleus* \ + | morphos* | superux* | rtmk* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ +-- +2.19.1 + diff --git a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch index 2c69f57878e..5a696d1c4b4 100644 --- a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch +++ b/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch @@ -1,4 +1,4 @@ -From 8474d78c459f4ec8f8930094faeaacb2b77bf68f Mon Sep 17 00:00:00 2001 +From 42ebd93d96cd060141e37d9d6601ca1e7d21040d Mon Sep 17 00:00:00 2001 From: "H.J. Lu" <hongjiu...@intel.com> Date: Fri, 20 Dec 2013 14:36:01 -0500 Subject: [PATCH] Add x32 support to config.guess @@ -16,15 +16,15 @@ URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/config.guess b/config.guess -index fddac42..17a4f70 100755 +index 97ad0733304d..92f16126465f 100755 --- a/config.guess +++ b/config.guess -@@ -1038,7 +1038,18 @@ EOF - echo ${UNAME_MACHINE}-dec-linux-${LIBC} +@@ -1090,7 +1090,18 @@ EOF + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-pc-linux-${LIBC} -+ eval $set_cc_for_build +- echo "$UNAME_MACHINE"-pc-linux-"$LIBC" ++ set_cc_for_build + X86_64_ABI= + # If there is a compiler, see if it is configured for 32-bit objects. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then @@ -35,10 +35,10 @@ index fddac42..17a4f70 100755 + X86_64_ABI=x32 + fi + fi -+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}${X86_64_ABI} ++ echo "$UNAME_MACHINE"-pc-linux-"$LIBC$X86_64_ABI" exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" -- -2.4.4 +2.19.1 diff --git a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch b/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch deleted file mode 100644 index 88e43cd8ac2..00000000000 --- a/sys-devel/gnuconfig/files/99999999/0002-add-ps2-targets-to-config.sub.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 582f9caf95b3ccf36e6248be3b5b414546b0a03e Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vap...@gentoo.org> -Date: Thu, 9 Oct 2008 15:51:35 -0400 -Subject: [PATCH] add ps2 targets to config.sub - ---- - config.sub | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/config.sub b/config.sub -index 88307c1..7ee2b4c 100755 ---- a/config.sub -+++ b/config.sub -@@ -258,7 +258,7 @@ case $basic_machine in - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ -- | d10v | d30v | dlx | dsp16xx \ -+ | d10v | d30v | dlx | dsp16xx | dvp \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -@@ -823,6 +823,24 @@ case $basic_machine in - basic_machine=m68k-atari - os=-mint - ;; -+ mipsEE* | ee | ps2) -+ basic_machine=mips64r5900el-scei -+ case $os in -+ -linux*) -+ ;; -+ *) -+ os=-elf -+ ;; -+ esac -+ ;; -+ iop) -+ basic_machine=mipsel-scei -+ os=-irx -+ ;; -+ dvp) -+ basic_machine=dvp-scei -+ os=-elf -+ ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; -@@ -1389,7 +1407,7 @@ case $os in - | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ -+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -irx* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ --- -2.3.1 - diff --git a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild index 387ba6cac9a..c7e0faa0146 100644 --- a/sys-devel/gnuconfig/gnuconfig-99999999.ebuild +++ b/sys-devel/gnuconfig/gnuconfig-99999999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="5" +EAPI="6" inherit eutils if [[ ${PV} == "99999999" ]] ; then @@ -31,9 +31,9 @@ maint_pkg_create() { cp "${FILESDIR}"/${PV}/*.patch . || die local tar="${T}/gnuconfig-${ver}.tar.bz2" - tar -jcf ${tar} ./* || die "creating tar failed" + tar -jcf "${tar}" ./* || die "creating tar failed" einfo "Packaged tar now available:" - einfo "$(du -b ${tar})" + einfo "$(du -b "${tar}")" } src_unpack() { @@ -46,7 +46,8 @@ src_unpack() { } src_prepare() { - epatch "${S}"/*.patch + default + eapply "${S}"/*.patch use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637 }
