mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-crypt/rhash: Fix triplet issues and restore fbsd/macos keywords
I was waiting for upstream to release the fix but that is taking a while so I've patched it. Closes: https://bugs.gentoo.org/651334 Package-Manager: Portage-2.3.45, Repoman-2.3.10
This commit is contained in:
23
app-crypt/rhash/files/darwin-triplet.patch
Normal file
23
app-crypt/rhash/files/darwin-triplet.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
From 35a830d1968465e4ecb079273f032b754bac6c66 Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <chewi@gentoo.org>
|
||||
Date: Sun, 25 Mar 2018 17:40:49 +0100
|
||||
Subject: [PATCH] configure: Add target OS clause for Darwin
|
||||
|
||||
These triplets can also have a version number suffix, for example,
|
||||
x86_64-apple-darwin16.
|
||||
---
|
||||
configure | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 5b6b710..2d8ac42 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -410,6 +410,7 @@ else
|
||||
amigaos) TARGET_OS=AmigaOS ;;
|
||||
mingw32*) TARGET_OS=MINGW32 ;;
|
||||
wine) TARGET_OS=Wine ;;
|
||||
+ darwin*) TARGET_OS=Darwin ;;
|
||||
esac
|
||||
}
|
||||
TARGET_OS="UNKNOWN"
|
||||
23
app-crypt/rhash/files/freebsd-triplet.patch
Normal file
23
app-crypt/rhash/files/freebsd-triplet.patch
Normal file
@@ -0,0 +1,23 @@
|
||||
From 14db7f9ee87e05450853ba0e1d8e83cc34aef3e4 Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <chewi@aura-online.co.uk>
|
||||
Date: Sat, 24 Mar 2018 13:51:56 +0000
|
||||
Subject: [PATCH] configure: Match FreeBSD triplets with versions
|
||||
|
||||
Triplets such as x86_64-unknown-freebsd11.1 are common.
|
||||
---
|
||||
configure | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 8ebb929..5b6b710 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -398,7 +398,7 @@ else
|
||||
part=$(echo $BUILD_TARGET | cut -d '-' -f $component)
|
||||
case "$(echo $part | tr '[A-Z]' '[a-z]')" in
|
||||
linux) TARGET_OS=Linux ;;
|
||||
- freebsd) TARGET_OS=FreeBSD ;;
|
||||
+ freebsd*) TARGET_OS=FreeBSD ;;
|
||||
gnu/kfreebsd) TARGET_OS=FreeBSD ;;
|
||||
netbsd) TARGET_OS=NetBSD ;;
|
||||
bsd/os) TARGET_OS=BSD/OS ;;
|
||||
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x64-solaris ~x86-solaris"
|
||||
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||
IUSE="debug nls libressl ssl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
@@ -28,6 +28,7 @@ S="${WORKDIR}/RHash-${PV}"
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/unquote-cc.patch
|
||||
"${FILESDIR}"/${P}-no_echon.patch
|
||||
"${FILESDIR}"/{freebsd,darwin}-triplet.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user