[gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/files/

["Aaron Bauman" <bman@gentoo.org>]

commit:     d766603ba4c7e66fb838445f6bdc8ab46a878aac
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 10 18:07:14 2020 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Thu Jun 11 22:40:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d766603b

net-misc/memcached: remove unused patches

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16169
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../memcached/files/memcached-1.6.0-gcc10.patch    | 34 ---------------
 .../memcached/files/memcached-1.6.5-ia64.patch     | 51 ----------------------
 2 files changed, 85 deletions(-)

diff --git a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
deleted file mode 100644
index d250b31e912..00000000000
--- a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Subject: [PATCH] crc32c: fix multiple definitions
-
-gcc-10 will change the default from -fcommon to fno-common:
-https://gcc.gnu.org/PR85678.
-
-The error also happens if CFLAGS=-fno-common passed explicitly.
-
-Reported-By: Toralf Förster <toralf@gentoo.org>
-Bug: https://bugs.gentoo.org/711982
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.c memcached-1.6.0/crc32c.c
---- memcached-1.6.0.orig/crc32c.c	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.c	2020-03-10 22:19:07.610247164 -0700
-@@ -390,6 +390,7 @@
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
-+crc_func crc32c;
- void crc32c_init(void) {
-     #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-     int sse42;
-diff -Nuar --exclude '*~' --exclude config.log --exclude autom4te.cache memcached-1.6.0.orig/crc32c.h memcached-1.6.0/crc32c.h
---- memcached-1.6.0.orig/crc32c.h	2019-10-21 01:48:04.000000000 -0700
-+++ memcached-1.6.0/crc32c.h	2020-03-10 22:17:12.086974212 -0700
-@@ -2,7 +2,7 @@
- #define    CRC32C_H
- 
- typedef uint32_t (*crc_func)(uint32_t crc, const void *buf, size_t len);
--crc_func crc32c;
-+extern crc_func crc32c;
- 
- void crc32c_init(void);
- 

diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
deleted file mode 100644
index 5a73913b92e..00000000000
--- a/net-misc/memcached/files/memcached-1.6.5-ia64.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-https://github.com/memcached/memcached/commit/73633d31b22068dfda5ef969c08139c083d96d71.patch
-
-From 73633d31b22068dfda5ef969c08139c083d96d71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 Apr 2020 10:08:19 +0100
-Subject: [PATCH] crc32c.c: don't attempt to enable hardware crc32 on ia64
-
-Itanium has no hardware crc32 implementation and build fails as:
-
-```
-ia64-unknown-linux-gnu-gcc -DHAVE_CONFIG_H -I.  -DNDEBUG   -g -O2 -pthread \
-    ... -c -o memcached-crc32c.o `test -f 'crc32c.c' || echo './'`crc32c.c
-crc32c.c: In function 'crc32c_init':
-crc32c.c:385:9: error: unknown register name '%edx' in 'asm'
-  385 |         __asm__("cpuid" \
-      |         ^~~~~~~
-```
-
-The change removes ia64 from crc32 paths.
-
-Bug: https://bugs.gentoo.org/718136
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- crc32c.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
---- a/crc32c.c
-+++ b/crc32c.c
-@@ -167,7 +167,7 @@ static uint32_t crc32c_hw_aarch64(uint32_t crc, const void* buf, size_t len)
- #endif
- 
- /* Apply if the platform is intel */
--#if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+#if defined(__X86_64__)||defined(__x86_64__)
- 
- /* Multiply a matrix times a vector over the Galois field of two elements,
-    GF(2).  Each element is a bit in an unsigned integer.  mat must have at
-@@ -388,12 +388,11 @@ static uint32_t crc32c_hw(uint32_t crc, const void *buf, size_t len)
-                 : "%ebx", "%edx"); \
-         (have) = (ecx >> 20) & 1; \
-     } while (0)
--
- #endif
- /* Compute a CRC-32C.  If the crc32 instruction is available, use the hardware
-    version.  Otherwise, use the software version. */
- void crc32c_init(void) {
--    #if defined(__X86_64__)||defined(__x86_64__)||defined(__ia64__)
-+    #if defined(__X86_64__)||defined(__x86_64__)
-     int sse42;
-     SSE42(sse42);
-