* [gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/, net-misc/memcached/files/
@ 2020-03-11 5:42 Robin H. Johnson
0 siblings, 0 replies; 2+ messages in thread
From: Robin H. Johnson @ 2020-03-11 5:42 UTC (permalink / raw
To: gentoo-commits
commit: f9acf146c21b1433f3c9337dd49d05c0060f825e
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 11 05:41:19 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Mar 11 05:41:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9acf146
net-misc/memcached: fix -fno-common
Upstream merged our prior patch for -fno-common/gcc10, but also
introduced a new regression -fno-common in the latest release.
Fixes: https://bugs.gentoo.org/711982
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
.../memcached/files/memcached-1.6.0-gcc10.patch | 34 ++++++++++++++++++++++
net-misc/memcached/memcached-1.6.0.ebuild | 2 +-
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/net-misc/memcached/files/memcached-1.6.0-gcc10.patch b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
new file mode 100644
index 00000000000..d250b31e912
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.6.0-gcc10.patch
@@ -0,0 +1,34 @@
+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/memcached-1.6.0.ebuild b/net-misc/memcached/memcached-1.6.0.ebuild
index 1cce9361ede..ed887ee56b2 100644
--- a/net-misc/memcached/memcached-1.6.0.ebuild
+++ b/net-misc/memcached/memcached-1.6.0.ebuild
@@ -35,7 +35,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
- #"${FILESDIR}/${PN}-1.5.21-hash-fix-build-failure-against-gcc-10.patch"
+ "${FILESDIR}/${PN}-1.6.0-gcc10.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/, net-misc/memcached/files/
@ 2020-05-05 21:53 Sergei Trofimovich
0 siblings, 0 replies; 2+ messages in thread
From: Sergei Trofimovich @ 2020-05-05 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 73d30f360cfcfeb20e7a634407310fe04a112336
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 5 21:53:19 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 5 21:53:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73d30f36
net-misc/memcached: tweak crc32c build on ia64, bug #718136
Closes: https://bugs.gentoo.org/718136
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../memcached/files/memcached-1.6.5-ia64.patch | 51 ++++++++++++++++++++++
net-misc/memcached/memcached-1.6.5.ebuild | 1 +
2 files changed, 52 insertions(+)
diff --git a/net-misc/memcached/files/memcached-1.6.5-ia64.patch b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
new file mode 100644
index 00000000000..5a73913b92e
--- /dev/null
+++ b/net-misc/memcached/files/memcached-1.6.5-ia64.patch
@@ -0,0 +1,51 @@
+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);
+
diff --git a/net-misc/memcached/memcached-1.6.5.ebuild b/net-misc/memcached/memcached-1.6.5.ebuild
index 75cbb9370f3..206190e3a92 100644
--- a/net-misc/memcached/memcached-1.6.5.ebuild
+++ b/net-misc/memcached/memcached-1.6.5.ebuild
@@ -35,6 +35,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+ "${FILESDIR}/${PN}-1.6.5-ia64.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-05-05 21:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-11 5:42 [gentoo-commits] repo/gentoo:master commit in: net-misc/memcached/, net-misc/memcached/files/ Robin H. Johnson
-- strict thread matches above, loose matches on Subject: below --
2020-05-05 21:53 Sergei Trofimovich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox