diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
| commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
| tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /net-misc/memcached/files | |
| parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) | |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'net-misc/memcached/files')
| -rw-r--r-- | net-misc/memcached/files/memcached-1.6.0-gcc10.patch | 34 | ||||
| -rw-r--r-- | net-misc/memcached/files/memcached.init2 | 2 |
2 files changed, 35 insertions, 1 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 new file mode 100644 index 000000000000..d250b31e9129 --- /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/files/memcached.init2 b/net-misc/memcached/files/memcached.init2 index 4bdfec6b945c..412e8e0a953b 100644 --- a/net-misc/memcached/files/memcached.init2 +++ b/net-misc/memcached/files/memcached.init2 @@ -10,7 +10,7 @@ if [ -n "${CONF}" ]; then PIDFILE="${PIDBASE}.${CONF}.pid" CONFSRC="${CONFBASE}.${CONF}" if [ -f "${CONFSRC}" ]; then - source "${CONFSRC}" + . "${CONFSRC}" else eerror "The configuration file $CONFSRC was not found!" fi |