From c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Feb 2021 21:41:11 +0000 Subject: gentoo (valentine's day) resync : 14.02.2021 --- net-misc/memcached/Manifest | 1 - ....21-hash-fix-build-failure-against-gcc-10.patch | 56 ---------------------- 2 files changed, 57 deletions(-) delete mode 100644 net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch (limited to 'net-misc/memcached') diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest index 9af0f86767d0..5d6db44e5242 100644 --- a/net-misc/memcached/Manifest +++ b/net-misc/memcached/Manifest @@ -2,7 +2,6 @@ AUX memcached-1.2.2-fbsd.patch 328 BLAKE2B b556c92a194ba7cd9405bbedcaa6b65ce6c3c AUX memcached-1.4.0-fix-as-needed-linking.patch 1557 BLAKE2B 1d0d66a9ec44855215a1d661177e7457b22068c9f1c3b6ca3c2ded25e3eed34eb17a034102fbbdd2fa6670e87ae6b6f05adc826f848a84f7649608e4547ae39a SHA512 a177f82d13b25a1ee13b02852040289a46b08fba750467026ecd8932d12008c7a276ea4b9b166de3d3371f5e7f9a6e0ef8d15315ab1ec9d10928dd7f40090253 AUX memcached-1.4.17-EWOULDBLOCK.patch 506 BLAKE2B e6e7c597dc227f42c0af0cb45d99a802b2bbcf5af3f7bcc1de26305951e0396c879ceb2b651f21b199df0ffabdfcb739626111d0e086d12736603500860453bd SHA512 6ddd823154a384e7502e138528b8d391b9fe203366c56f14ae38ddb6d8b6394fd0297e5fad90cf94f7bc1e7d90e04e0aab17b545fe3f1d2a55f0e2158e9a98dc AUX memcached-1.4.4-as-needed.patch 1135 BLAKE2B b290f928cb0c280742eb95b69e1fdec1ffe6f9d47a5a1e3b676f70d25a675d4b4762a4d69915a81cc0e30036e74254ce08f93b625bc842ae0e4a6d7520798f85 SHA512 16f1ebae169d47836a83857e9da1ba4498b061367979d2ec5d271b91c939b1b5655ced68f37653c8996e41266e2daa64c2ae63d787b54d221ce92d544cea722e -AUX memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch 1470 BLAKE2B 987f8ff094ae43e8fe94458b70f413b994f0125b16987b7aca56bb0847f3c6ff10372cff4a4f12fa651cad72601fef6b4a45cfe0c05036e264f9c53f5846e686 SHA512 c0c139d82762c397cfb86307ab989b3c0a31547e3bccb8b13b4537e78b7f62a4b92aafc60e5cb092098a95038a9f93e8ee6be8702b130fafa11c81112a1fce69 AUX memcached.confd 872 BLAKE2B d57dfb6da370f5e980b9e7143323a6cf51fecea802e5d034ca92b0e26280cbd99db3c487f57ef8f1d6ebfae49db44852b88018a95f8d2b0e0a1c6ce16bbaa5c0 SHA512 77dd11565172336c3db24663510ab15ce3c919a656d1c7a12b0bae830c1576247844f84e6b4fe10c96a54f2e64ae8f6c502eee3d84d68ea1d370fea99a586f63 AUX memcached.init2 2200 BLAKE2B 9bc5fe76047b7559aec93030829963111353fb5adc3ba558cb672bb96aa642c7e8df87a49d5081d7a33892c6896e91a291a497d74d6985767a364c9697713391 SHA512 873a0bb0ef7eb31f8749e040b7a4db0188367f3c5f953984a98ca21877ddde440085e338cacceb45dc80f4e833129056525143dab1efae4a838c72143f2ae61a AUX memcached.service 273 BLAKE2B bfe217d2ec7fd9aead468f4f5b100843287a49bef163dd106349f3275acbffaca60e09c8b723a566a96065d8208eb52f44f7c3ad24a8aaf3980471e8d0478b77 SHA512 647f06160142c5e38e4009203609bf2152dd1bdd4b94be9e2bf3c5741e631419fc9cf300575a65a905956eec916d736c4e3b3d3e3c80438f1b33cd10fe4dcd95 diff --git a/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch b/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch deleted file mode 100644 index 527d4607316c..000000000000 --- a/net-misc/memcached/files/memcached-1.5.21-hash-fix-build-failure-against-gcc-10.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 63b8e76067523a02a3e0215db1aef0b34edcf708 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich -Date: Thu, 23 Jan 2020 22:16:36 +0000 -Subject: [PATCH] hash: fix build failure against gcc-10 - -On gcc-10 (and gcc-9 -fno-common) build fails as: - -``` -gcc -g -O2 -pthread -pthread -Wall -Werror -pedantic -Wmissing-prototypes \ - -Wmissing-declarations -Wredundant-decls -o memcached ... -levent -ld: memcached-hash.o:memcached/hash.h:5: - multiple definition of `hash'; memcached-memcached.o:memcached/hash.h:5: first defined here -``` - -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: Brian Evans -Bug: https://bugs.gentoo.org/706196 -Signed-off-by: Sergei Trofimovich ---- - hash.c | 2 ++ - hash.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/hash.c b/hash.c -index a0c3036..b5ff28a 100644 ---- a/hash.c -+++ b/hash.c -@@ -4,6 +4,8 @@ - #include "jenkins_hash.h" - #include "murmur3_hash.h" - -+hash_func hash; -+ - int hash_init(enum hashfunc_type type) { - switch(type) { - case JENKINS_HASH: -diff --git a/hash.h b/hash.h -index 059d1e2..3b2a984 100644 ---- a/hash.h -+++ b/hash.h -@@ -2,7 +2,7 @@ - #define HASH_H - - typedef uint32_t (*hash_func)(const void *key, size_t length); --hash_func hash; -+extern hash_func hash; - - enum hashfunc_type { - JENKINS_HASH=0, MURMUR3_HASH --- -2.25.0 - -- cgit v1.2.3