diff options
Diffstat (limited to 'app-crypt/rhash/files')
| -rw-r--r-- | app-crypt/rhash/files/darwin-triplet.patch | 23 | ||||
| -rw-r--r-- | app-crypt/rhash/files/freebsd-triplet.patch | 23 | ||||
| -rw-r--r-- | app-crypt/rhash/files/rhash-1.3.6-no_echon.patch | 54 | ||||
| -rw-r--r-- | app-crypt/rhash/files/rhash-1.4.2-clang.patch | 80 | ||||
| -rw-r--r-- | app-crypt/rhash/files/rhash-1.4.4-prefix.patch | 22 | ||||
| -rw-r--r-- | app-crypt/rhash/files/unquote-cc.patch | 26 |
6 files changed, 22 insertions, 206 deletions
diff --git a/app-crypt/rhash/files/darwin-triplet.patch b/app-crypt/rhash/files/darwin-triplet.patch deleted file mode 100644 index 49b7e121d818..000000000000 --- a/app-crypt/rhash/files/darwin-triplet.patch +++ /dev/null @@ -1,23 +0,0 @@ -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" diff --git a/app-crypt/rhash/files/freebsd-triplet.patch b/app-crypt/rhash/files/freebsd-triplet.patch deleted file mode 100644 index 94b615824be7..000000000000 --- a/app-crypt/rhash/files/freebsd-triplet.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 ;; diff --git a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch b/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch deleted file mode 100644 index 9b25b29a89f3..000000000000 --- a/app-crypt/rhash/files/rhash-1.3.6-no_echon.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c1776248a0b34a690e99ab9a7a814c34f78088ec Mon Sep 17 00:00:00 2001 -From: Lars Wendler <polynomial-c@gentoo.org> -Date: Mon, 19 Mar 2018 10:47:13 +0100 -Subject: [PATCH] "echo -n" cannot be expected to work with every POSIX shell - -See "man 1p echo" section APPLICATION USAGE. This patch replaces "echo -n" -with "printf '%s'". ---- - configure | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) - -diff --git a/configure b/configure -index f480f7b..2a7d485 100755 ---- a/configure -+++ b/configure -@@ -22,17 +22,6 @@ INSTALL_LIB_STATIC=auto - INSTALL_LIB_SHARED=auto - INSTALL_PKGCONFIGDIR="$PKG_INSTALLDIR" - --case $(echo -n) in -- -n) # SysV style -- ECHO_N= -- ECHO_C='\c' -- ;; -- *) # BSD style -- ECHO_N='-n ' -- ECHO_C= -- ;; --esac -- - # display error message and exit - die () { - echo -@@ -235,7 +224,7 @@ trap remove_tmpdir EXIT - - str_concat() - { -- echo ${ECHO_N} $@ ${ECHO_C} -+ printf '%s ' $@ - } - - yn_nonempty() -@@ -246,7 +235,7 @@ yn_nonempty() - # Use this before starting a check - start_check() { - echo "============ Checking for $1 ============" >> "$TMPLOG" -- echo ${ECHO_N} "Checking for $1 ... ${ECHO_C}" -+ printf '%s' "Checking for $1 ... " - res_comment="" - } - --- -2.16.2 - diff --git a/app-crypt/rhash/files/rhash-1.4.2-clang.patch b/app-crypt/rhash/files/rhash-1.4.2-clang.patch deleted file mode 100644 index 460e73a6ace7..000000000000 --- a/app-crypt/rhash/files/rhash-1.4.2-clang.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 4dc506066cf1727b021e6352535a8bb315c3f8dc Mon Sep 17 00:00:00 2001 -From: Aleksey <rhash.admin@gmail.com> -Date: Sat, 17 Jul 2021 18:39:41 +0300 -Subject: [PATCH] configure: fix clang detection on macOS - ---- - configure | 58 +++++++++++++++++++++++++++---------------------------- - 1 file changed, 28 insertions(+), 30 deletions(-) - -diff --git a/configure b/configure -index 59d432b..111270a 100755 ---- a/configure -+++ b/configure -@@ -519,38 +519,36 @@ else - elif run_cmd "$CC --version"; then - cc_name_tmp=$($CC --version 2>&1 | head -n 1 | cut -d ' ' -f 1) - fi -- if test -n "${cc_name_tmp}"; then -- if echo "$cc_name_tmp" | grep -q "gcc"; then -- cc_name=$cc_name_tmp -- start_check "$CC version" -- cc_vendor=gnu -- cc_version=$($CC -dumpversion 2>&1) -- if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then -- cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null) -- if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then -- cc_version=$cc_v2 -- fi -+ if echo "$cc_name_tmp" | grep -q "gcc"; then -+ cc_name=$cc_name_tmp -+ start_check "$CC version" -+ cc_vendor=gnu -+ cc_version=$($CC -dumpversion 2>&1) -+ if ! echo $cc_version | grep -q '^[0-9][0-9]*\.[0-9]'; then -+ cc_v2=$($CC -dumpfullversion -dumpversion 2>/dev/null) -+ if echo $cc_v2 | grep -q '^[0-9][0-9]*\.[0-9]'; then -+ cc_version=$cc_v2 - fi -- case $cc_version in -- 2.96*) -- cc_fail=yes -- ;; -- *) -- _cc_major=$(echo $cc_version | cut -d '.' -f 1) -- _cc_minor=$(echo $cc_version | cut -d '.' -f 2) -- _cc_mini=$(echo $cc_version | cut -d '.' -f 3) -- ;; -- esac -- finish_check "$cc_name $cc_version" -- break -- fi -- if echo "$cc_name_tmp" | grep -q "clang"; then -- start_check "$CC version" -- cc_vendor=clang -- cc_version=$($CC -dumpversion 2>&1) -- finish_check "clang $cc_version" -- break - fi -+ case $cc_version in -+ 2.96*) -+ cc_fail=yes -+ ;; -+ *) -+ _cc_major=$(echo $cc_version | cut -d '.' -f 1) -+ _cc_minor=$(echo $cc_version | cut -d '.' -f 2) -+ _cc_mini=$(echo $cc_version | cut -d '.' -f 3) -+ ;; -+ esac -+ finish_check "$cc_name $cc_version" -+ break -+ elif $CC --version 2>&1 | grep -q "clang"; then -+ start_check "$CC version" -+ cc_vendor=clang -+ cc_version=$($CC -dumpversion 2>&1) -+ finish_check "clang $cc_version" -+ break -+ else - cc_name_tmp=$($CC -V 2>&1 | head -n 1 | cut -d ' ' -f 2,3) - if test "$cc_name_tmp" = "Sun C"; then - start_check "$CC version" diff --git a/app-crypt/rhash/files/rhash-1.4.4-prefix.patch b/app-crypt/rhash/files/rhash-1.4.4-prefix.patch new file mode 100644 index 000000000000..ce2e72bf149e --- /dev/null +++ b/app-crypt/rhash/files/rhash-1.4.4-prefix.patch @@ -0,0 +1,22 @@ +From c804982d1b24c6533118b3068d2cfdca685076f3 Mon Sep 17 00:00:00 2001 +From: Aleksey Kravchenko <rhash.admin@gmail.com> +Date: Mon, 7 Aug 2023 01:00:37 +0300 +Subject: [PATCH] Fix #243: Incorrect assigment in the configure script + +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 39ef8c1b..63cbd8d0 100755 +--- a/configure ++++ b/configure +@@ -877,7 +877,7 @@ if test "$OPT_STATIC" = "no"; then + RHASH_TEST_OPTIONS=--shared + test "$INSTALL_LIB_SHARED" = "auto" && INSTALL_LIB_SHARED=yes + test "$INSTALL_LIB_STATIC" = "yes" && RHASH_BUILD_TARGETS="$RHASH_BUILD_TARGETS \$(LIBRHASH_STATIC)" +- RHASH_LDFLAGS=$RHASH_LDFLAGS $GETTEXT_LDFLAGS ++ RHASH_LDFLAGS=$(join_params $RHASH_LDFLAGS $GETTEXT_LDFLAGS) + else + LIBRHASH_TYPE=static + LIBRHASH_PATH="\$(LIBRHASH_STATIC)" diff --git a/app-crypt/rhash/files/unquote-cc.patch b/app-crypt/rhash/files/unquote-cc.patch deleted file mode 100644 index 77ccc9b2c5f7..000000000000 --- a/app-crypt/rhash/files/unquote-cc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4558d6753611ab1bf21765017e5b451aee8409f6 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Sun, 18 Mar 2018 14:23:28 +0000 -Subject: [PATCH] configure: Don't quote $CC when calling it - -It might have additional arguments. ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index f480f7b..8ebb929 100755 ---- a/configure -+++ b/configure -@@ -480,7 +480,7 @@ if test "$(basename $CC)" = "icc" || test "$(basename $CC)" = "ecc"; then - else - CC_TMP="$CC" - for CC in "$CC_TMP" gcc cc ; do -- if "$CC" -v >/dev/null 2>&1; then -+ if $CC -v >/dev/null 2>&1; then - cc_name_tmp=$($CC -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) - if test "$cc_name_tmp" = "gcc"; then - cc_name=$cc_name_tmp --- -2.16.1 - |