From 032a3dbb5d4ea63ec6c2ceb39c067ea6424b5792 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Jan 2020 19:28:42 +0000 Subject: gentoo resync : 20.01.2020 --- net-libs/libtirpc/Manifest | 3 +- .../libtirpc-1.2.5-avoid-multiple-definition.patch | 44 ++++++++++++++++++++++ net-libs/libtirpc/libtirpc-1.2.5.ebuild | 5 ++- 3 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch (limited to 'net-libs/libtirpc') diff --git a/net-libs/libtirpc/Manifest b/net-libs/libtirpc/Manifest index 9356a6c09661..bfc1b2b5a63e 100644 --- a/net-libs/libtirpc/Manifest +++ b/net-libs/libtirpc/Manifest @@ -1,7 +1,8 @@ AUX libtirpc-1.0.2-bcopy-to-memmove.patch 2226 BLAKE2B c0a5244f21d9a5531303b317946fe53b695aafc54095f617a3918f28a94033cd0a30b5f3bfd6fe671b64d4919d255298b55fbb4fa6179c255ff561517361d4e5 SHA512 221c85c47ec56edbdb4ce95e0f67680050b8d9f666c6795ceef7f7720acdf05a535e4afbcdc4e2e5eaeb6edc04bd43f65486df772ad2a0c87987d1c204661f00 +AUX libtirpc-1.2.5-avoid-multiple-definition.patch 1041 BLAKE2B 2fd918dad5c759b49f07335685d01bef8bd1c0127647e097a5fbd58f9ddcfbe1179bedd306917755ce39428fcb4c130f9b628f60233dc2464da96c748fcf96ae SHA512 dd72fdc6fd457d89780c4784772c372eb493df3deac928a7c06709cd3517be5586584751a2a9324fc90157838a6fe594ffe91b4f8baebd6115482d76e94985ca DIST libtirpc-1.1.4.tar.bz2 510924 BLAKE2B 1780f9bb0543583c01b60bda681add0ec2f8718eda4ce4653883c772466178e37d0a3fb47004109f81de470129458561fac4f109f45154c64b6fb729f0212c90 SHA512 392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 DIST libtirpc-1.2.5.tar.bz2 513146 BLAKE2B 732e4832f3440d9fa08c45c01c56135ff1b96564c55d33e9b3f16c8361a4f02e49a35638b73110bb72da4bfb78107ccb1b4d475d1ecbdd62dcc156529a372c3e SHA512 d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 DIST libtirpc-glibc-nfs.tar.xz 8948 BLAKE2B 7316623d9f2b6928e296137fe2bf6794b208d549c2ffba9e4a35b47f7b04bf023798a09f38c02d039debf6adc466d7689cf3c8274d71a22eaff08729642c0a28 SHA512 90255bf0a27af16164e0710dd940778609925d473f4343093ff19d98cc4f23023788bf4edf0178eae1961afc0ba8b69b273de95b7d7e2afdb706701d8ba6f7ba EBUILD libtirpc-1.1.4.ebuild 1554 BLAKE2B cd9c64b7e550affa9814e8a5e4b9b8c9d5627640debe472cddc16ea36300841b843eb2fd0dca7e3d5eb339c74b2a063a408246ebdd0c7fed086ff6ce31dd60f6 SHA512 c767bac49fb1fb2a22862ee273f94348e176ce229293ade3d81c4c65fb818be7d49980f2bfb54cb443e1f165fa2ee6c0ae908308a89eeb24e2bfde513cd5c033 -EBUILD libtirpc-1.2.5.ebuild 1513 BLAKE2B 57bc520006881b7199e58fcf5ad5e6b00639fbab84a4785830c8bab517c0448d503395f3c5423bd55c3a349b30ee4aa83a20f02f84770c2ce8ad90f485ee979c SHA512 4a3c6555642a221b0249ee69f32354cab38e4a889ed0370bc10f6b1cdd3288150ef78b8bfdd212359e4f56a42f473ea7376d9a13c6acb000c48d3d40e9d649f0 +EBUILD libtirpc-1.2.5.ebuild 1596 BLAKE2B f560316f374438565bd7dbe35bc569a9882e5a71d9597de0a78f017977f1a3a0c84e6685b785a46325270d0cac7cd93ee8cafb2bfa769d8c3073a13d0125206e SHA512 cf97c65ce6b8cfe8c08db3e8ae85f68e4881f4d2e4b39ef64a6637ddce7a662268229f7cc9e93ba601a080927738ae31f13bb46e997e23194516f44084ecd451 MISC metadata.xml 404 BLAKE2B fb708c5f3f1f4112708810b7fefe2bd1b0d20a15864d730e43cf42480c91d35984238352b419c3bd4b8f3ef831340a781af8b61a857bd6ff36f7521c5dd3c044 SHA512 9fbf0b58cc794cb08cc5075df5ca801d50c2724ca0826700bc18ac8a4a0c0d7231abd1aee8ec6de674b7cf7aa69cd80e7e6b3be90e9aeca36334c11b728db4fa diff --git a/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch new file mode 100644 index 000000000000..a5fecc54ced3 --- /dev/null +++ b/net-libs/libtirpc/files/libtirpc-1.2.5-avoid-multiple-definition.patch @@ -0,0 +1,44 @@ +From 69682de06816de9b9014441d23bda1918ee2e2fb Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 19 Jan 2020 16:57:45 -0500 +Subject: [PATCH] Avoid multiple-definiton with gcc -fno-common + +GCC 10 enables -fno-common by default. + +Bug: https://bugs.gentoo.org/705896 +--- + src/rpc_com.h | 3 +-- + src/svc.c | 3 +++ + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/rpc_com.h b/src/rpc_com.h +index 10bec79..76badef 100644 +--- a/src/rpc_com.h ++++ b/src/rpc_com.h +@@ -61,8 +61,7 @@ void __xprt_unregister_unlocked(SVCXPRT *); + void __xprt_set_raddr(SVCXPRT *, const struct sockaddr_storage *); + + +-SVCXPRT **__svc_xports; +-int __svc_maxrec; ++extern int __svc_maxrec; + + #ifdef __cplusplus + } +diff --git a/src/svc.c b/src/svc.c +index b59467b..6db164b 100644 +--- a/src/svc.c ++++ b/src/svc.c +@@ -57,6 +57,9 @@ + + #define max(a, b) (a > b ? a : b) + ++static SVCXPRT **__svc_xports; ++int __svc_maxrec; ++ + /* + * The services list + * Each entry represents a set of procedures (an rpc program). +-- +2.25.0 + diff --git a/net-libs/libtirpc/libtirpc-1.2.5.ebuild b/net-libs/libtirpc/libtirpc-1.2.5.ebuild index 5d80a874a922..9970a7e62550 100644 --- a/net-libs/libtirpc/libtirpc-1.2.5.ebuild +++ b/net-libs/libtirpc/libtirpc-1.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,6 +23,9 @@ BDEPEND=" src_prepare() { cp -r "${WORKDIR}"/tirpc "${S}"/ || die + local PATCHES=( + "${FILESDIR}"/libtirpc-1.2.5-avoid-multiple-definition.patch + ) default eautoreconf } -- cgit v1.2.3