From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- sys-fs/zfs-kmod/Manifest | 3 +- sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch | 48 ++++++++++++++++++++++ sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild | 2 + 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch (limited to 'sys-fs/zfs-kmod') diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 5cad82bfa5d2..656afab5f7a9 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -1,7 +1,8 @@ +AUX 0.8.4-powerpc_jmp_weak.patch 1314 BLAKE2B 5cec0c5bf0e7c8ba4fb29539384eeb28e431956a94853d7c7722fc4dfc680f984c3e1567bc27effb28e94b1a411f9d7e57a26536fb4dee9446b12183558ab49b SHA512 dabea2f795e3ee2d7df13c803ac4cb21499e23d6663f14d52a7b270075176a4378cd15d04d051999aa7ec6b8cf49e645435363053e16640f28068c2764580047 AUX 2.0.0_rc1-U__BMI__.patch 966 BLAKE2B 370c9796450a451cb41aed4df7a927e0a88f674c55273a0680788ea8f42c7ca7ddbd4d75e092c59a6255adecb4dbe94b28d565cd54c03170cda07b15d138c8db SHA512 c568bee17b0a4ef6569fa531cd2bfbd483c766c8f16d045e9ee86c01c1d687701010659b58bbe3874c0d45e5e94a52ae10e5c31ab004a3215ed4dae6be8ba545 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1 DIST zfs-2.0.0-rc1.tar.gz 12820598 BLAKE2B 6ea935447e4f95eb4040533843677f0091c9620fc387c76818df69a6653467e10aecd07ece22b2a32f849dc52ab0160149147416af90d78c5284f403571f7962 SHA512 b70cd10672d4424a6ffaaa58b4fa14b7d1b6481413463abd9b6d75698e80d94301fd54c7e091d63ebad9c8838eaaef6449223a55f041a62ae8292882feb195b5 -EBUILD zfs-kmod-0.8.4-r1.ebuild 4502 BLAKE2B 65144dcd12b826831a05a8d9a3b83735026f5f4ba62c49a05038118b9a9adc0bc0eb1c37d142f4e095fd1fe6c78b07d83becdaa502ec79cabc9980d732369a62 SHA512 1395227f463331b00d0ff990bb76f3dfa41f41473126f98d1f024a101193f9344919c68acccccf4225e41673593b7183f8fec9ce510b0ae6a9f9bb925ee9e139 +EBUILD zfs-kmod-0.8.4-r1.ebuild 4558 BLAKE2B 90bab78673ace8d1684f7b06e1392745bc3b7bdbf4e695bac7d9478e35dba9daf0e121e3e72ece248c997cb5f1daa4000db9e9500a686e38d72319c6a3fd9355 SHA512 f2db01438ea0b53a2f964feba65343c15ae69dd3c47bda54321aeda4d0f19affc2cf4fb99e9f829f7968fa2774fffe86b4fce0cc310af775efc5165652425e8b EBUILD zfs-kmod-2.0.0_rc1.ebuild 4391 BLAKE2B 06daf5d1387aab0e90d9a3573159afdc58d121f3e8b799a34e4d87dda486113e54ec3bce70fed3fe928b33ce660e0fbfb96ae2529016a352a747ca105c8b6b96 SHA512 24970fd8f61f8bec233b9582858af235fa00cb160c7e7d781001366c6d07ca748b939f802ff8634f222622f936af1c46b764e787ac99387b4d8dc73e30103c4d EBUILD zfs-kmod-9999.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a diff --git a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch new file mode 100644 index 000000000000..1a2948a3158c --- /dev/null +++ b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch @@ -0,0 +1,48 @@ +From bd0efd1f062bfba5dd2d6b1fe30b6949f8e0a8ef Mon Sep 17 00:00:00 2001 +From: sterlingjensen <5555776+sterlingjensen@users.noreply.github.com> +Date: Mon, 24 Aug 2020 22:41:05 -0500 +Subject: [PATCH] Mark lua setjmp/longjmp for powerpc weak + +Linux already defines setjmp/longjmp for powerpc, which leads to +duplicate symbols in a statically linked build. + +Signed-off-by: Sterlng Jensen +--- + module/lua/setjmp/setjmp_ppc.S | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/module/lua/setjmp/setjmp_ppc.S b/module/lua/setjmp/setjmp_ppc.S +index f787ef34913..72aa5d5ab5b 100644 +--- a/module/lua/setjmp/setjmp_ppc.S ++++ b/module/lua/setjmp/setjmp_ppc.S +@@ -56,7 +56,7 @@ + #define ENTRY(name) \ + .align 2 ; \ + .type name,@function; \ +- .globl name; \ ++ .weak name; \ + name: + + #else /* PPC64_ELF_ABI_v1 */ +@@ -65,8 +65,8 @@ name: + #define GLUE(a,b) XGLUE(a,b) + #define ENTRY(name) \ + .align 2 ; \ +- .globl name; \ +- .globl GLUE(.,name); \ ++ .weak name; \ ++ .weak GLUE(.,name); \ + .pushsection ".opd","aw"; \ + name: \ + .quad GLUE(.,name); \ +@@ -83,8 +83,8 @@ GLUE(.,name): + #define ENTRY(name) \ + .text; \ + .p2align 4; \ +- .globl name; \ +- .type name,@function; \ ++ .weak name; \ ++ .type name,@function; \ + name: + + #endif /* __powerpc64__ */ diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild index 59ea52ab658b..2276604b161c 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild @@ -37,6 +37,8 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +PATCHES=( "${FILESDIR}/${PV}-powerpc_jmp_weak.patch" ) + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC -- cgit v1.2.3