From 16449a80e28af2209916cc66d19c9a44ca2b90d9 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Feb 2019 15:11:50 +0000 Subject: gentoo resync : 20.02.2019 --- dev-lang/perl/Manifest | 4 ++-- dev-lang/perl/perl-5.28.0.ebuild | 7 +++++-- dev-lang/perl/perl-5.28.9999.ebuild | 7 +++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'dev-lang/perl') diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 3bb64a8bcf72..c2fbd9c590db 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -19,6 +19,6 @@ EBUILD perl-5.26.1-r1.ebuild 19255 BLAKE2B a29acfd3ea358d0d46886aae104acf8e55ad7 EBUILD perl-5.26.1-r2.ebuild 19668 BLAKE2B 5936c92398cf8a889bd946705f2667abd07fc81a64ea3f8c44cd83f3c29719352f4ea938b8d7fb7e3d5d138dcba12f94692166aaca8d98a3640c772850ec9e5c SHA512 154b021e91b01ecd55a5af50bc530f080745b122cd5a77652589c236d4bceea93f4379a1c8e751eb1787118e3133e1f5daab8dccf88365f7976c8a015591190e EBUILD perl-5.26.2.ebuild 20018 BLAKE2B 35fc87f0fd3d14255553214e5d16a15390469265e7a1dbd9942668d96ffea825228da4c63fdddbfa70df869746559d7966b81dd1343c1bcebb1c87718bb1a3b3 SHA512 23672000c34668a207d3ec6629950310542996be5225271500f52d42779e6b77370db02a32c28953cfc7d479153d418af8ad6ddfb90ceb6437fdd4086b5a5a92 EBUILD perl-5.26.9999.ebuild 20031 BLAKE2B d6e3d8053ddbe6b3bd6fad32c2453b996ac5aea5d854354540bf3de7bd55cb2282f6c72122928d037318c5f6d54755b45f56a52ea8704c3fc4824f70a2776b9c SHA512 11d55af2d0f4ea7546b0633e4056e2cc3699b75061c4ba80e0bd17be358c9ea4900b780089853bef21718f6101257b0a9f9e15624b609332c10831d8f02bdb44 -EBUILD perl-5.28.0.ebuild 20090 BLAKE2B 4dc04222f752b59ddad730088a3744cc596a9a29cf08495df4cceedb1050cb656f9c2694c8a7e06aa4bb6a539c833d0f1a2630b8862958383a2fbfe1c1b16f15 SHA512 171f958e9de8050a584a88cb560fdfd6b652cab51a19c76e86d2be1dc2fbd117f95ded349db1aa5e8126905d6488f74a6652555c0da0bf186aa63642763b55ab -EBUILD perl-5.28.9999.ebuild 20090 BLAKE2B 4dc04222f752b59ddad730088a3744cc596a9a29cf08495df4cceedb1050cb656f9c2694c8a7e06aa4bb6a539c833d0f1a2630b8862958383a2fbfe1c1b16f15 SHA512 171f958e9de8050a584a88cb560fdfd6b652cab51a19c76e86d2be1dc2fbd117f95ded349db1aa5e8126905d6488f74a6652555c0da0bf186aa63642763b55ab +EBUILD perl-5.28.0.ebuild 20176 BLAKE2B 66db6330cc0536313b23bd84272fcbbf12cac02eff0cf6e5f1b45de66f77ab6eedcfc80f1925a15c82ef004234e4a82d15cae6993c6c5030c90378bb2c58dc66 SHA512 92eaffde9ebbc2cf8c6339eec71520ab4288a9e392eca4282db9b4281b29979f8854273239b650e2435aa8fd1bc525548ff79fe58fd8f5e1c7bc87ebaddfb322 +EBUILD perl-5.28.9999.ebuild 20176 BLAKE2B 66db6330cc0536313b23bd84272fcbbf12cac02eff0cf6e5f1b45de66f77ab6eedcfc80f1925a15c82ef004234e4a82d15cae6993c6c5030c90378bb2c58dc66 SHA512 92eaffde9ebbc2cf8c6339eec71520ab4288a9e392eca4282db9b4281b29979f8854273239b650e2435aa8fd1bc525548ff79fe58fd8f5e1c7bc87ebaddfb322 MISC metadata.xml 430 BLAKE2B 8625fd07f63a7943a85c3919d6ae6db622b752caa2803c56c72a22b270244261331fbab8b760e6d00acb8480770c9ef1d1beaaa22cc6044660821687c0cd8c33 SHA512 ca4c43e2016b7df707894713465700a90d2b8551b57fc4d660cff75edb1e8cc2456f9ae10431839ad6738f290d4f5911fae360eaa1d4670859d855de3d568583 diff --git a/dev-lang/perl/perl-5.28.0.ebuild b/dev-lang/perl/perl-5.28.0.ebuild index bacc75e30d88..71fc2b82b39b 100644 --- a/dev-lang/perl/perl-5.28.0.ebuild +++ b/dev-lang/perl/perl-5.28.0.ebuild @@ -307,8 +307,6 @@ src_prepare() { # do NOT mess with nsl, on Solaris this is always necessary, # when -lsocket is used e.g. to get h_errno sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die - # and set a soname - sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die fi einfo "Applying patches from ${PATCH_BASE} ..." @@ -333,6 +331,11 @@ src_prepare() { sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die fi + if [[ ${CHOST} == *-solaris* ]] ; then + # set a soname, fix linking against just built libperl + sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die + fi + default } diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild index bacc75e30d88..71fc2b82b39b 100644 --- a/dev-lang/perl/perl-5.28.9999.ebuild +++ b/dev-lang/perl/perl-5.28.9999.ebuild @@ -307,8 +307,6 @@ src_prepare() { # do NOT mess with nsl, on Solaris this is always necessary, # when -lsocket is used e.g. to get h_errno sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die - # and set a soname - sed -i 's/sunos\*/sunos*|solaris*/' Makefile.SH || die fi einfo "Applying patches from ${PATCH_BASE} ..." @@ -333,6 +331,11 @@ src_prepare() { sed -i "/my..sysroot/s:'':'${EPREFIX}':" ext/Errno/Errno_pm.PL || die fi + if [[ ${CHOST} == *-solaris* ]] ; then + # set a soname, fix linking against just built libperl + sed -i -e 's/netbsd\*/netbsd*|solaris*/' Makefile.SH || die + fi + default } -- cgit v1.2.3