summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/gnuconfig/Manifest1
-rw-r--r--sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch44
-rw-r--r--sys-devel/gnuconfig/gnuconfig-20200621.ebuild63
3 files changed, 64 insertions, 44 deletions
diff --git a/sys-devel/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index c699587ec982..e1c6b35f9966 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1 +1,2 @@
DIST gnuconfig-20190912.tar.bz2 58742 BLAKE2B 2d5eba2d966d8b6bb18ba9340031c3f3b96fddad7cb156103620bc8fff3d4824b3acf63e0f9046f389cbd9ce2b88348bdddd123134ca910ce18641001943e9e7 SHA512 346ab0e8938052b66b733b0251c5e1cb8d7a61e89630cebcf0039295c5a3652db0798e62b3ec44743c0ccee72d75270dc82fec43e97912c140ac0267a81f6115
+DIST gnuconfig-20200621.tar.bz2 58729 BLAKE2B 8be2ff224620d0d93f676951ec8dcc7a4f1bfdfcb83e2e07371aa6fdf2f08a8d0e8503aecdd55954a0246f0d4119f31b24d60d461500db07757b061c89914df4 SHA512 25778100cb6b47a4ffa8a1875d3109a8b304bf3984549b53e2cbc1e31222aa9614ce01d34451cf6545af62b843378ab217d3396535ed4389ff3e8a7ddaa948ff
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
deleted file mode 100644
index 5a696d1c4b4e..000000000000
--- a/sys-devel/gnuconfig/files/99999999/0002-Add-x32-support-to-config.guess.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 42ebd93d96cd060141e37d9d6601ca1e7d21040d Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hongjiu.lu@intel.com>
-Date: Fri, 20 Dec 2013 14:36:01 -0500
-Subject: [PATCH] Add x32 support to config.guess
-
-GCC on Linux/x86-64 may be configured for x32:
-
-https://sites.google.com/site/x32abi/
-
-by default and the Linux/x32 target should be x86_64-VENDOR-linux-gnux32.
-This patch adds x32 support to config.guess. OK to install?
-
-URL: http://gcc.gnu.org/ml/gcc-patches/2012-08/msg01083.html
----
- config.guess | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/config.guess b/config.guess
-index 97ad0733304d..92f16126465f 100755
---- a/config.guess
-+++ b/config.guess
-@@ -1090,7 +1090,18 @@ EOF
- echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
- exit ;;
- x86_64:Linux:*:*)
-- 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
-+ if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \
-+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+ grep IS_X32 >/dev/null
-+ then
-+ X86_64_ABI=x32
-+ fi
-+ fi
-+ echo "$UNAME_MACHINE"-pc-linux-"$LIBC$X86_64_ABI"
- exit ;;
- xtensa*:Linux:*:*)
- echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
---
-2.19.1
-
diff --git a/sys-devel/gnuconfig/gnuconfig-20200621.ebuild b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
new file mode 100644
index 000000000000..7eb2a8392c5e
--- /dev/null
+++ b/sys-devel/gnuconfig/gnuconfig-20200621.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+if [[ ${PV} == "99999999" ]] ; then
+ EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
+
+ inherit git-r3
+else
+ SRC_URI="https://dev.gentoo.org/~whissi/dist/${PN}/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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"
+ S="${WORKDIR}"
+fi
+
+DESCRIPTION="Updated config.sub and config.guess file from GNU"
+HOMEPAGE="https://savannah.gnu.org/projects/config"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+maint_pkg_create() {
+ cd "${S}"
+
+ local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
+ [[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
+
+ cp "${FILESDIR}"/${PV}/*.patch . || die
+
+ local tar="${T}/gnuconfig-${ver}.tar.bz2"
+ tar -jcf "${tar}" ./* || die "creating tar failed"
+ einfo "Packaged tar now available:"
+ einfo "$(du -b "${tar}")"
+}
+
+src_unpack() {
+ if [[ ${PV} == "99999999" ]] ; then
+ git-r3_src_unpack
+ maint_pkg_create
+ else
+ unpack ${A}
+ fi
+}
+
+src_prepare() {
+ default
+ eapply "${S}"/*.patch
+ use elibc_uclibc && sed -i 's:linux-gnu:linux-uclibc:' testsuite/config-guess.data #180637
+}
+
+src_compile() { :;}
+
+src_test() {
+ emake check
+}
+
+src_install() {
+ insinto /usr/share/${PN}
+ doins config.{sub,guess}
+ fperms +x /usr/share/${PN}/config.{sub,guess}
+ dodoc ChangeLog
+}