From f20a854a6189579b2cc296900c479d9b6b5b595e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 2 May 2023 05:22:02 +0100 Subject: gentoo auto-resync : 02:05:2023 - 05:22:02 --- dev-lang/Manifest.gz | Bin 19506 -> 19499 bytes dev-lang/julia/Manifest | 3 +- dev-lang/julia/files/julia-1.8.3-gcc13.patch | 10 + dev-lang/julia/julia-1.8.5-r1.ebuild | 230 +++++++ dev-lang/julia/julia-1.8.5.ebuild | 210 ------ dev-lang/perl/Manifest | 2 + dev-lang/perl/files/perl-5.36.1-http-tiny.patch | 25 + dev-lang/perl/perl-5.36.1-r1.ebuild | 826 ++++++++++++++++++++++++ 8 files changed, 1095 insertions(+), 211 deletions(-) create mode 100644 dev-lang/julia/files/julia-1.8.3-gcc13.patch create mode 100644 dev-lang/julia/julia-1.8.5-r1.ebuild delete mode 100644 dev-lang/julia/julia-1.8.5.ebuild create mode 100644 dev-lang/perl/files/perl-5.36.1-http-tiny.patch create mode 100644 dev-lang/perl/perl-5.36.1-r1.ebuild (limited to 'dev-lang') diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz index 2b5f3803dad4..d69d1c07631c 100644 Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ diff --git a/dev-lang/julia/Manifest b/dev-lang/julia/Manifest index 3ad1d7f5456f..45293928de99 100644 --- a/dev-lang/julia/Manifest +++ b/dev-lang/julia/Manifest @@ -1,4 +1,5 @@ AUX julia-1.8.0-llvm-no-bindings.patch 703 BLAKE2B 2b67752b4e9519681a77eef7e96a8d0fa9eea5a703891b6497424dfb396ef70cfd00e41cea00329ac00bc96eb87823fe95bfabcd968faec41704d196d9babf45 SHA512 2969496dff1f2bed59b652cdd3295108f57f2fc16e9f6c6b63eb900ffa75436dbce3a438f9e2d451b929b21eafec0307e8af5cafb1f94d0bd1ef22a0651b8ec7 +AUX julia-1.8.3-gcc13.patch 303 BLAKE2B 104f1b47c2f010133aefe2cb05274057a7319ae6552bb76582caf9813dc18e0302f21c72f794eb63a10545b3cf508397ffffecbfde4a277451a4b5582859f126 SHA512 4748e0dad02d54970f98e9e7d984941819960137d1f7901d61c8a71052b8ad1ee535936a2a36aa244474182612448d3b779e42bb7e43292b11b962bc353dbe0b DIST julia-0b211609.patch 9574 BLAKE2B bf43f143b8873ad1812d95d5866a77f28b5dfeb05f41c9dd8f384109ec8cfab09f78bb7b891d5178d6c445ba58cdfe2bdf0cc4c5bf032910c42d4fd1b89883f7 SHA512 aaeeee2e96773589e4347af4df169ef3d241a4c7a22d28ec356a13062f7d11f043cebce8b79afbebb1fb411ad957d4d14880ae051924cb694b39283ccce1658b DIST julia-1.8.0-074d761f.patch 2198 BLAKE2B 7d4b147e290defceaad1b5b6d0c2c9a323b47d685bb1865b23c84aa68135c00104e653a5046d276aa540415ee4c95426f1a4538df3ba0ae4c348966a2f2b1742 SHA512 ff1e23746851b1b7a4480df75815abb35ccc8006f622acb5fb3928e20832cf55022c96650590c8dfea9b39185a3284a0d1310dee3f439429c91e00af567b66f1 DIST julia-1.8.0-0db596e6.patch 15029 BLAKE2B 2d5152436c2a7b0dcd60346c9fe9ea008f7672a68ae038762c5952c6c85173d28b3fd7335282e783cc1f91102e8dd58ae9967caa476ad8f93dd60f8f485fbbe3 SHA512 1f4eb42656bbaed3c85d520875c687f0dd98e9ef0d73f0d3a2b3ac4395020984effc03477c56ab6594cd15e87899923591f6cabeb4e2a43c26725ebe51dbf0be @@ -18,5 +19,5 @@ DIST julia-1.8.3-full.tar.gz 275266765 BLAKE2B 2cd54e33cea5d53a93e8ec9c1cd44df4e DIST julia-1.8.5-full.tar.gz 275344455 BLAKE2B d51ee25e9c7dd54e3fcc35cd75c909686cc5e48c6b34371cd100bddb038b76e1ba8812bab554ffb8ca5b725cc30fec1a0fb4f58220de8917de35dc2d3a159d81 SHA512 3f92cdecdfc79194e1cde3ec96871bde984c2527d0cd3909c91a27a819d734e39260c5fe7129d958e88db1965f8b5d61ffe7e95c7cddac111aeafe844e29900d DIST julia-a48ad530.patch 2790 BLAKE2B 4f7b1a3baeadff597b8b7e0e55705ff09625457a7889179e2f7d7ec1370008a5329901c45ad038bd830276d120e35d87254fe55ea497b2632988254ddd591df2 SHA512 4222901d28b100a81743a4092fb78862160e5b1c23d1a7fd242df815703897b974c8aec79518f67f4cf33ccbc88f75bf6e10d1189b7163b94b5d347ef8db940b EBUILD julia-1.8.3-r4.ebuild 4739 BLAKE2B dc2938814b3360e6671b52f75f25ae9f2e96c336ca77d179b03ea2d1052831034d2b0baa8ced9c56270b0c8efbf6e5c862d5bfbfda8584615cea9d5d9a92d272 SHA512 9825cb9e172dcefea3cbe3f5d3e66685205e70aefae920993bc902448eace99a73efdf3e758b35b1cc094b9dadf26d17a9d9565b3e66a5778a0de1f481be19fa -EBUILD julia-1.8.5.ebuild 5729 BLAKE2B 0ac9e135cd6eb071268f9cc4c16932365f8bc3479d623b3d03e9a30e3f6adc7f1aafccfa6265bbe61f45fca10e81d583f33f0de057a179e7395ae7bfc29480ff SHA512 c73994d2b52792cf6d1cdd16dc6c328b8d2e4cbd5b39be6509af4c14cfa55ab72ab8a4bd2db34220d1d9301a4738dd1f3c82aca3ba209578d81a7c78feb1e5d3 +EBUILD julia-1.8.5-r1.ebuild 6229 BLAKE2B c3ae1ed3d9efe78cba7c7ec2de18f12ece20d849e9b3784bd4ac85a720c4996967af90ea558df89b1fbdc353203051735ec476652e3e28a249490c219eab1195 SHA512 2e158e9ae872749239d9c2a0f1d99769c8600f6f403205c4fd64dad2690638036b16ba8038c9871a1d633d0636ecb8c439a9654171115cf0bf400baab9757a7a MISC metadata.xml 1180 BLAKE2B 32bf6e513df1c656c4d59030e3bda12a756c6577562b5ced73c9e46f204c774b2411186e8a995687424d068fea83b6b379fe5c7ed9fd1f5d01949e66b95a164a SHA512 9ee29e001cb2306b430cccd11f742829c2e9f28030f9622bf2557e7789054b2d61f903422e6c4a789bf6fa5a86310f35a2e3f08f4b0faa4c812879012e8329d0 diff --git a/dev-lang/julia/files/julia-1.8.3-gcc13.patch b/dev-lang/julia/files/julia-1.8.3-gcc13.patch new file mode 100644 index 000000000000..96e2e48ba78d --- /dev/null +++ b/dev-lang/julia/files/julia-1.8.3-gcc13.patch @@ -0,0 +1,10 @@ +--- a/deps/srccache/JuliaLang-llvm-project-8a2ae8c/llvm/include/llvm/Support/Signals.h ++++ b/deps/srccache/JuliaLang-llvm-project-8a2ae8c/llvm/include/llvm/Support/Signals.h +@@ -15,6 +15,7 @@ + #define LLVM_SUPPORT_SIGNALS_H + + #include ++#include + + namespace llvm { + class StringRef; diff --git a/dev-lang/julia/julia-1.8.5-r1.ebuild b/dev-lang/julia/julia-1.8.5-r1.ebuild new file mode 100644 index 000000000000..fbe4522110f4 --- /dev/null +++ b/dev-lang/julia/julia-1.8.5-r1.ebuild @@ -0,0 +1,230 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# correct versions for stdlibs are in deps/checksums +# for everything else, run with network-sandbox and wait for the crash + +EAPI=8 + +# >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184 +MY_LLVM_V=13.0.1 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit check-reqs flag-o-matic optfeature pax-utils python-any-r1 toolchain-funcs + +DESCRIPTION="High-performance programming language for technical computing" +HOMEPAGE="https://julialang.org/ + https://github.com/JuliaLang/julia/" +SRC_URI=" + https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz + https://github.com/JuliaLang/julia/commit/0b211609.patch + -> ${PN}-0b211609.patch + https://github.com/JuliaLang/julia/commit/a48ad530.patch + -> ${PN}-a48ad530.patch +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND=" + >=dev-libs/libutf8proc-2.6.1:0=[-cjk] + >=dev-util/patchelf-0.13 + >=net-libs/mbedtls-2.2 + >=sci-mathematics/dsfmt-2.2.4 + >=sys-libs/libunwind-1.1:0= + >=virtual/blas-3.6 + app-arch/p7zip + app-misc/ca-certificates + dev-libs/gmp:0= + dev-libs/libgit2:0 + dev-libs/mpfr:0= + net-misc/curl[http2,ssh] + sci-libs/amd:0= + sci-libs/arpack:0= + sci-libs/camd:0= + sci-libs/ccolamd:0= + sci-libs/cholmod:0= + sci-libs/colamd:0= + sci-libs/fftw:3.0=[threads] + sci-libs/openlibm:0= + sci-libs/spqr:0= + sci-libs/umfpack:0= + sys-libs/zlib:0= + virtual/lapack +" +DEPEND="${RDEPEND}" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/cmake + virtual/pkgconfig +" + +CHECKREQS_DISK_BUILD="4G" +PATCHES=( + "${DISTDIR}"/${PN}-0b211609.patch + "${DISTDIR}"/${PN}-a48ad530.patch + "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch + "${FILESDIR}"/${PN}-1.8.3-gcc13.patch +) +QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping. + +# Huge thanks to Arch Linux developers for the patches. +archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/" +archlinux_patches=( + 074d761f.patch # wanted + 0db596e6.patch # secondary + 190565c2.patch # secondary + 23f39f83.patch # secondary + 3423639d.patch # secondary + 68adc00e.patch # secondary + 700c69b1.patch # secondary + ed9851b0.patch # wanted + julia-hardcoded-libs.patch # wanted + julia-libunwind-1.6.patch # wanted + julia-mpfr-4.2.patch # secondary + julia-system-cblas.patch # wanted +) +for archlinux_patch in ${archlinux_patches[@]} ; do + archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}" + SRC_URI+=" + ${archlinux_uri}/${archlinux_patch} + -> ${archlinux_patch_name} + " + PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" ) +done + +pkg_setup() { + check-reqs_pkg_setup + python-any-r1_pkg_setup +} + +src_unpack() { + local -a tounpack=( ${A} ) + # the main source tree, followed by deps + unpack "${tounpack[0]}" + + mkdir -p "${S}/deps/srccache/" + local i + for i in "${tounpack[@]:1}"; do + cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die + done + + # Extract tarballs for patching. + cd "${S}/deps/srccache/" || die + tar xf llvm-julia-13.0.1-3.tar.gz || die +} + +src_prepare() { + default + + # Sledgehammer: + # - prevent fetching of bundled stuff in compile and install phase + # - respect CFLAGS + # - respect EPREFIX and Gentoo specific paths + + sed -i \ + -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ + Make.inc || die + + sed -i \ + -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ + src/Makefile || die + + # disable doc install starting git fetching + sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die + + # Blank the tarball checksum check script. + echo "#!/bin/sh" > deps/tools/jlchecksum || die + + # Repack tarballs. + cd "${S}/deps/srccache/" || die + tar czf llvm-julia-13.0.1-3.tar.gz JuliaLang-llvm-project-8a2ae8c || die +} + +src_configure() { + # bug #855602 + filter-lto + + # julia does not play well with the system versions of libuv + # Fails to compile with libpcre2 on split-usr, bug #893336 + # USE_SYSTEM_LIBM=0 implies using external openlibm + cat <<-EOF > Make.user + LOCALBASE:=${EPREFIX}/usr + override prefix:=${EPREFIX}/usr + override libdir:=\$(prefix)/$(get_libdir) + override CC:=$(tc-getCC) + override CXX:=$(tc-getCXX) + override AR:=$(tc-getAR) + + BUNDLE_DEBUG_LIBS:=0 + USE_BINARYBUILDER:=0 + USE_INTEL_JITEVENTS=0 + USE_SYSTEM_CSL:=1 + USE_SYSTEM_LLVM:=0 + USE_SYSTEM_LIBUNWIND:=1 + USE_SYSTEM_PCRE:=0 + USE_SYSTEM_LIBM:=0 + USE_SYSTEM_OPENLIBM:=1 + USE_SYSTEM_DSFMT:=1 + USE_SYSTEM_BLAS:=1 + USE_SYSTEM_LAPACK:=1 + USE_SYSTEM_LIBBLASTRAMPOLINE:=0 + USE_SYSTEM_GMP:=1 + USE_SYSTEM_MPFR:=1 + USE_SYSTEM_LIBSUITESPARSE:=1 + USE_SYSTEM_LIBUV:=0 + USE_SYSTEM_UTF8PROC:=1 + USE_SYSTEM_MBEDTLS:=1 + USE_SYSTEM_LIBSSH2:=1 + USE_SYSTEM_NGHTTP2:=1 + USE_SYSTEM_CURL:=1 + USE_SYSTEM_LIBGIT2:=1 + USE_SYSTEM_PATCHELF:=1 + USE_SYSTEM_ZLIB:=1 + USE_SYSTEM_P7ZIP:=1 + VERBOSE:=1 + EOF +} + +src_compile() { + # Julia accesses /proc/self/mem on Linux. + addpredict /proc/self/mem + + emake + pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" +} + +src_install() { + emake -j1 install DESTDIR="${D}" + dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md + + local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) + cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die + cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die + + mv "${ED}"/usr/etc/julia "${ED}"/etc || die + rmdir "${ED}"/usr/etc || die + mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die + rmdir "${ED}"/usr/share/doc/julia || die + + # The appdata directory is deprecated. + mv "${ED}"/usr/share/{appdata,metainfo}/ || die + + # Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978 + dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem + + # Julia always searches for "sys.so" inside "/usr/lib/julia", + # bug: https://github.com/JuliaLang/julia/issues/49574 + if [[ $(get_libdir) == "lib64" ]] ; then + insinto /usr/lib/julia + doins "${ED}"/usr/$(get_libdir)/julia/sys.so + fi +} + +pkg_postinst() { + optfeature "Julia Plots" sci-visualization/gr +} diff --git a/dev-lang/julia/julia-1.8.5.ebuild b/dev-lang/julia/julia-1.8.5.ebuild deleted file mode 100644 index eff4ebe3ca0b..000000000000 --- a/dev-lang/julia/julia-1.8.5.ebuild +++ /dev/null @@ -1,210 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# correct versions for stdlibs are in deps/checksums -# for everything else, run with network-sandbox and wait for the crash - -EAPI=8 - -# >=1.8.2 still sits on LLVM 13, bug: https://bugs.gentoo.org/876184 -MY_LLVM_V=13.0.1 - -inherit check-reqs flag-o-matic pax-utils toolchain-funcs optfeature - -DESCRIPTION="High-performance programming language for technical computing" -HOMEPAGE="https://julialang.org/ - https://github.com/JuliaLang/julia/" -SRC_URI=" - https://github.com/JuliaLang/julia/releases/download/v${PV}/${P}-full.tar.gz - https://github.com/JuliaLang/julia/commit/0b211609.patch - -> ${PN}-0b211609.patch - https://github.com/JuliaLang/julia/commit/a48ad530.patch - -> ${PN}-a48ad530.patch -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND=" - >=dev-libs/libutf8proc-2.6.1:0=[-cjk] - >=dev-util/patchelf-0.13 - >=net-libs/mbedtls-2.2 - >=sci-mathematics/dsfmt-2.2.4 - >=sys-libs/libunwind-1.1:0= - >=virtual/blas-3.6 - app-arch/p7zip - app-misc/ca-certificates - dev-libs/gmp:0= - dev-libs/libgit2:0 - dev-libs/mpfr:0= - net-misc/curl[http2,ssh] - sci-libs/amd:0= - sci-libs/arpack:0= - sci-libs/camd:0= - sci-libs/ccolamd:0= - sci-libs/cholmod:0= - sci-libs/colamd:0= - sci-libs/fftw:3.0=[threads] - sci-libs/openlibm:0= - sci-libs/spqr:0= - sci-libs/umfpack:0= - sys-libs/zlib:0= - virtual/lapack -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/cmake - virtual/pkgconfig -" - -CHECKREQS_DISK_BUILD="4G" -PATCHES=( - "${DISTDIR}"/${PN}-0b211609.patch - "${DISTDIR}"/${PN}-a48ad530.patch - "${FILESDIR}"/${PN}-1.8.0-llvm-no-bindings.patch -) -QA_FLAGS_IGNORED+='usr/.*/julia/sys.so' # Julia sysimage generated by bootstrapping. - -# Huge thanks to Arch Linux developers for the patches. -archlinux_uri="https://raw.githubusercontent.com/archlinux/svntogit-community/packages/julia/trunk/" -archlinux_patches=( - 074d761f.patch # wanted - 0db596e6.patch # secondary - 190565c2.patch # secondary - 23f39f83.patch # secondary - 3423639d.patch # secondary - 68adc00e.patch # secondary - 700c69b1.patch # secondary - ed9851b0.patch # wanted - julia-hardcoded-libs.patch # wanted - julia-libunwind-1.6.patch # wanted - julia-mpfr-4.2.patch # secondary - julia-system-cblas.patch # wanted -) -for archlinux_patch in ${archlinux_patches[@]} ; do - archlinux_patch_name="${PN}-1.8.0-${archlinux_patch}" - SRC_URI+=" - ${archlinux_uri}/${archlinux_patch} - -> ${archlinux_patch_name} - " - PATCHES+=( "${DISTDIR}/${archlinux_patch_name}" ) -done - -src_unpack() { - local -a tounpack=( ${A} ) - # the main source tree, followed by deps - unpack "${tounpack[0]}" - - mkdir -p "${S}/deps/srccache/" - local i - for i in "${tounpack[@]:1}"; do - cp "${DISTDIR}/${i}" "${S}/deps/srccache/${i#julia-}" || die - done -} - -src_prepare() { - default - - # Sledgehammer: - # - prevent fetching of bundled stuff in compile and install phase - # - respect CFLAGS - # - respect EPREFIX and Gentoo specific paths - - sed -i \ - -e "\|SHIPFLAGS :=|c\\SHIPFLAGS := ${CFLAGS}" \ - Make.inc || die - - sed -i \ - -e "s|ar -rcs|$(tc-getAR) -rcs|g" \ - src/Makefile || die - - # disable doc install starting git fetching - sed -i -e 's~install: $(build_depsbindir)/stringreplace $(BUILDROOT)/doc/_build/html/en/index.html~install: $(build_depsbindir)/stringreplace~' Makefile || die -} - -src_configure() { - # bug #855602 - filter-lto - - # julia does not play well with the system versions of libuv - # Fails to compile with libpcre2 on split-usr, bug #893336 - # USE_SYSTEM_LIBM=0 implies using external openlibm - cat <<-EOF > Make.user - LOCALBASE:=${EPREFIX}/usr - override prefix:=${EPREFIX}/usr - override libdir:=\$(prefix)/$(get_libdir) - override CC:=$(tc-getCC) - override CXX:=$(tc-getCXX) - override AR:=$(tc-getAR) - - BUNDLE_DEBUG_LIBS:=0 - USE_BINARYBUILDER:=0 - USE_INTEL_JITEVENTS=0 - USE_SYSTEM_CSL:=1 - USE_SYSTEM_LLVM:=0 - USE_SYSTEM_LIBUNWIND:=1 - USE_SYSTEM_PCRE:=0 - USE_SYSTEM_LIBM:=0 - USE_SYSTEM_OPENLIBM:=1 - USE_SYSTEM_DSFMT:=1 - USE_SYSTEM_BLAS:=1 - USE_SYSTEM_LAPACK:=1 - USE_SYSTEM_LIBBLASTRAMPOLINE:=0 - USE_SYSTEM_GMP:=1 - USE_SYSTEM_MPFR:=1 - USE_SYSTEM_LIBSUITESPARSE:=1 - USE_SYSTEM_LIBUV:=0 - USE_SYSTEM_UTF8PROC:=1 - USE_SYSTEM_MBEDTLS:=1 - USE_SYSTEM_LIBSSH2:=1 - USE_SYSTEM_NGHTTP2:=1 - USE_SYSTEM_CURL:=1 - USE_SYSTEM_LIBGIT2:=1 - USE_SYSTEM_PATCHELF:=1 - USE_SYSTEM_ZLIB:=1 - USE_SYSTEM_P7ZIP:=1 - VERBOSE:=1 - EOF -} - -src_compile() { - # Julia accesses /proc/self/mem on Linux. - addpredict /proc/self/mem - - emake - pax-mark m "$(file usr/bin/julia-* | awk -F : '/ELF/ {print $1}')" -} - -src_install() { - emake -j1 install DESTDIR="${D}" - dodoc CONTRIBUTING.md HISTORY.md NEWS.md README.md THIRDPARTY.md - - local llvmslot=$(ver_cut 1 ${MY_LLVM_V}) - cp "${S}"/usr/lib/libLLVM-${llvmslot}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die - cp "${S}"/usr/lib/libLLVM-${MY_LLVM_V}jl.so "${ED}"/usr/$(get_libdir)/julia/ || die - - mv "${ED}"/usr/etc/julia "${ED}"/etc || die - rmdir "${ED}"/usr/etc || die - mv "${ED}"/usr/share/doc/julia/html "${ED}"/usr/share/doc/"${PF}" || die - rmdir "${ED}"/usr/share/doc/julia || die - - # The appdata directory is deprecated. - mv "${ED}"/usr/share/{appdata,metainfo}/ || die - - # Link ca-certificates.crt, bug: https://bugs.gentoo.org/888978 - dosym -r /etc/ssl/certs/ca-certificates.crt /usr/share/julia/cert.pem - - # Julia always searches for "sys.so" inside "/usr/lib/julia", - # bug: https://github.com/JuliaLang/julia/issues/49574 - if [[ $(get_libdir) == "lib64" ]] ; then - insinto /usr/lib/julia - doins "${ED}"/usr/$(get_libdir)/julia/sys.so - fi -} - -pkg_postinst() { - optfeature "Julia Plots" sci-visualization/gr -} diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index a771ac09fe1f..c350c4edab1b 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,6 +1,7 @@ AUX perl-5.34.0-crossfit.patch 388 BLAKE2B dda2f10732422857f1a3977b6aa6ec0536dffaa53658e23378083393a55cf283906ef8f41dde2eb83e0de4e5dfd6dcd06d6b236f0a91c44086172bcaf105396a SHA512 5da4dd913790bd125667851807da9e37dac9cda78cce18ecffb8780f42d30b65f46817633e65027f5438f1a39286139fcf961d4bc98caf70946152200c3e72ee AUX perl-5.34.0-fallback-getcwd-pwd.patch 8158 BLAKE2B a6870b26dbfadb54c5ea4f075a4a5caad8d789853aade84ff434e5d994e9fdd82cdef6314a576b8cdb3a9948aa73aa650c1ff4656e9c8bca4fb58384396332b1 SHA512 fe778c2348da48006927b179d02d33489790f41afa079fabe6350853b2b2d8c168d0db7b81f1b6c988e3ac46d733326aab4aa4423a04d6380acf74eed91cfc5c AUX perl-5.36.0-clang16.patch 3850 BLAKE2B f691e7e23b18c5fe32b4f17fc0c786082fb1474fc3c06a46d6ef3b8609f10537b797308f403d4ca394a2666d752421fe2e7c0c224994c5271dd9211ba5d56652 SHA512 17d022d3a5909ecdf5e2c896d9c36caba006c4b3d0ed466a2c679b874210e7f84e0efcbc0ab5eea41e3eda0344fd869af46639ac94a0b943e961fb4044ced966 +AUX perl-5.36.1-http-tiny.patch 902 BLAKE2B 97fd9b3077e26b3dd758ca2037f9e769e255c7c1dbaadcf50e4a57aa5024774508297b1b7a95eab1d43f5791b2d519a356604fda8cc27e38aaf204125b3c5389 SHA512 81430a8099ddc21d5a34342a8d4ff008c38948b1fbb2b90bad6277884d476ea3191fa578f52ef13413d9e659740a9d9359e5a38e76166dfeeaadc324f60ee2db DIST perl-5.34.0-patches-1.tar.xz 20360 BLAKE2B e60074c49f357d4841708f58b5165a44201783238ff33ee81580bb83ba07d3d2dda447edd30a71ce8c9bafe5e5e0235b68e31a79081c3482bdd589231f0e898e SHA512 909e1fb22cda4ca769b51645b51a64df81b92210cfee388ac57834406bc13e404f0a1e6bad0888fafc73fc34b7fb224801fd02e87fb4c2f9145482ad74374e7b DIST perl-5.34.1-zlib-1.2.12-encrypt-standard.zip.bin 207 BLAKE2B b52e1322930d5f7b8d6e3a319d24322b5dffb2313bdc757c0c8eb8713fd03adace199c8449ccc306e49b5b71e3c1b9786b2acb0ab8780a09d718a1c54f653226 SHA512 5a7e0950f0f94bd961fa9cf3e4ab5dd30006bee0f4553da755688a32d0411a4a850a28d4f998b36e7177dcf3aba192b899ca4138e84452baffef1a0b2ed1fb7b DIST perl-5.34.1-zlib-1.2.12.patch.xz 180480 BLAKE2B 39da5c1ef406d018f73e641d86ff81d5257cf1f7d6c1b0caac9651a546d70a2e0fff53bf0fc584907e792cb681a961c8442ab355f8f0c2cfffbb26c997cdbac0 SHA512 b32b57721b10943e21003429b42c535f7833e450f097855162241775a161a557fe0ea86ce615d6a9c885f165f45438cabba5580f9b299796d3a3da5ea720f1ff @@ -13,5 +14,6 @@ DIST perl-cross-1.4.tar.gz 113861 BLAKE2B 7c7783afccc6a04ab122a7c60b1cff7f0a2725 EBUILD perl-5.34.1-r4.ebuild 26366 BLAKE2B 915cbe20d818039c9162dc5230650a0b8d443a8bdfc1bac76ba1a4f860697e2c54a8a9687b2b46998c4e0cdf537c3f40d883425687d593cfcdf424f22f9f6b6f SHA512 210f60d251fe9cea23cb260e7b619f314e00a645521958a5f079bdf1eedd022081fa01e3bc061a138de8e4df17d3495d9fb025476d14c939c80b4fcc34a48e5d EBUILD perl-5.36.0-r1.ebuild 25582 BLAKE2B 3156632039a3ca5f03471d425a5b4a8b26819aabee831b76ee1576f30dd53653a5ed8b29b9214b370b47807da33060cfdee0b2ca51d334a40c79378db5090c8f SHA512 868912cd2ff0b79d188383dd469ae4755f22d9be16d9916e9a15d1b0acf829761425c1916df45513aaf0a8fb40c7c972ad29f89807046a17a7f4777b10f44750 EBUILD perl-5.36.0-r2.ebuild 25796 BLAKE2B cfb47a8bbefceadcaf6496574fadb505cc293576030a0720e97233c229c1eea3d2de5e0682f87f101f287d9d15825e5a2c91dc6c553627ec33454d67514d6043 SHA512 fecac56aece5183755202102ccd349a4b5458d05c9c44dbc5de76fc8c0e6b92a75c2808a71889c4c9a7ce812c951b5b0da310d0feeddd7d0f39c8c9a4f778726 +EBUILD perl-5.36.1-r1.ebuild 25805 BLAKE2B ec7e5874ec66ac65d05d4d8226c7240ed808c5bd4d69aecbd88931ed651e6bb590b63cbfb4e18a28369ce55de56689b19f717f03628b395ff39535504f893c9a SHA512 fa055ecb3cb8e9a97088fb1e5e5a44c5997fcd639628657481eea2757f0ee28499bd5bf07d4d4df0df86dbb4323bad04553bef9babefc2276fbf61dbf146243c EBUILD perl-5.36.1.ebuild 25591 BLAKE2B dbb9e6bebf94a1db6a1f6d34989f193d973a54b6c6fb93fffd067c1a4f670af79f1bf52815e3e6edb3ed5b156d3ea686f5dc8fddc7dac175c26aa84ea1ef4cd1 SHA512 948ddf963505df9184c5c5ab94918f71f0072b6d288a19f7c34f831c8170f73685e0329121148d05616f2cf40525b3d9b2c95d2edf445134c292b2549e604445 MISC metadata.xml 621 BLAKE2B 8a14a3efd31858bd5be39476ff86bb9facf3984bbb1110c5b30c3af7aacfe0148357cf7c838ad94799c090a42ed036cc5a51205c3fcfd0d010833e0dad0e4820 SHA512 656902acadb21bf951bf08ca7775c095a5ec76f881215a2b7d3a42eb344a2b9e337cb9260ab87ff5a1730b5a0ef4efe852affdf2e418df9c7c39f18a0a7b89d4 diff --git a/dev-lang/perl/files/perl-5.36.1-http-tiny.patch b/dev-lang/perl/files/perl-5.36.1-http-tiny.patch new file mode 100644 index 000000000000..34907cc6d9fd --- /dev/null +++ b/dev-lang/perl/files/perl-5.36.1-http-tiny.patch @@ -0,0 +1,25 @@ +in current year, we should verify tls certs by default. +not doing so is as good as not using tls +https://www.openwall.com/lists/oss-security/2023/04/18/14 + +Source: +https://git.alpinelinux.org/aports/plain/main/perl/default-https-perl-http-tiny.patch?id=fc21c0f7930ae3a9e2f50bacc305fb167a456ded + +Bug: https://bugs.gentoo.org/905296 +See-also: https://github.com/chansen/p5-http-tiny/pull/151 +See-also: https://github.com/chansen/p5-http-tiny/issues/152 + +-- +diff --git a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +index 83ca06d..dc6217a 100644 +--- a/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm ++++ b/cpan/HTTP-Tiny/lib/HTTP/Tiny.pm +@@ -1055,7 +1055,7 @@ sub new { + timeout => 60, + max_line_size => 16384, + max_header_lines => 64, +- verify_SSL => 0, ++ verify_SSL => 1, + SSL_options => {}, + %args + }, $class; diff --git a/dev-lang/perl/perl-5.36.1-r1.ebuild b/dev-lang/perl/perl-5.36.1-r1.ebuild new file mode 100644 index 000000000000..a70fd75507d4 --- /dev/null +++ b/dev-lang/perl/perl-5.36.1-r1.ebuild @@ -0,0 +1,826 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit alternatives flag-o-matic toolchain-funcs multilib multiprocessing + +PATCH_VER=1 +CROSS_VER=1.4 +PATCH_BASE="perl-5.36.0-patches-${PATCH_VER}" +PATCH_DEV=dilfridge + +DIST_AUTHOR=RJBS + +# Greatest first, don't include yourself +# Devel point-releases are not ABI-intercompatible, but stable point releases are +# BIN_OLDVERSEN contains only C-ABI-intercompatible versions +PERL_BIN_OLDVERSEN="" + +if [[ "${PV##*.}" == "9999" ]]; then + DIST_VERSION=5.30.0 +else + DIST_VERSION="${PV/_rc/-RC}" +fi +SHORT_PV="${DIST_VERSION%.*}" + +# Even numbered major versions are ABI intercompatible +# Odd numbered major versions are not +if [[ $(( ${SHORT_PV#*.} % 2 )) == 1 ]]; then + SUBSLOT="${DIST_VERSION%-RC*}" +else + SUBSLOT="${DIST_VERSION%.*}" +fi + +# Used only in tar paths +MY_P="perl-${DIST_VERSION}" +# Used in library paths +MY_PV="${DIST_VERSION%-RC*}" + +DESCRIPTION="Larry Wall's Practical Extraction and Report Language" + +SRC_URI=" + mirror://cpan/src/5.0/${MY_P}.tar.xz + mirror://cpan/authors/id/${DIST_AUTHOR:0:1}/${DIST_AUTHOR:0:2}/${DIST_AUTHOR}/${MY_P}.tar.xz + https://github.com/gentoo-perl/perl-patchset/releases/download/${PATCH_BASE}/${PATCH_BASE}.tar.xz + https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${PATCH_BASE}.tar.xz + https://github.com/arsv/perl-cross/releases/download/${CROSS_VER}/perl-cross-${CROSS_VER}.tar.gz +" + +HOMEPAGE="https://www.perl.org/" + +LICENSE="|| ( Artistic GPL-1+ )" +SLOT="0/${SUBSLOT}" + +if [[ "${PV##*.}" != "9999" ]] && [[ "${PV/rc//}" == "${PV}" ]] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +fi + +IUSE="berkdb debug doc gdbm ithreads minimal quadmath" + +RDEPEND=" + berkdb? ( sys-libs/db:= ) + gdbm? ( >=sys-libs/gdbm-1.8.3:= ) + app-arch/bzip2 + >=sys-libs/zlib-1.2.12 + virtual/libcrypt:= +" +DEPEND="${RDEPEND}" +BDEPEND="${RDEPEND}" + +PDEPEND=" + !minimal? ( + >=app-admin/perl-cleaner-2.5 + >=virtual/perl-CPAN-2.290.0 + >=virtual/perl-Encode-3.120.0 + >=virtual/perl-File-Temp-0.230.400-r2 + >=virtual/perl-Data-Dumper-2.154.0 + virtual/perl-Test-Harness + ) +" +# bug 390719, bug 523624 +# virtual/perl-Test-Harness is here for the bundled ExtUtils::MakeMaker + +S="${WORKDIR}/${MY_P}" + +dual_scripts() { + src_remove_dual perl-core/Archive-Tar 2.400.0 ptar ptardiff ptargrep + src_remove_dual perl-core/CPAN 2.330.0 cpan + src_remove_dual perl-core/Digest-SHA 6.20.0 shasum + src_remove_dual perl-core/Encode 3.170.0 enc2xs piconv + src_remove_dual perl-core/ExtUtils-MakeMaker 7.640.0 instmodsh + src_remove_dual perl-core/ExtUtils-ParseXS 3.450.0 xsubpp + src_remove_dual perl-core/IO-Compress 2.106.0 zipdetails + src_remove_dual perl-core/JSON-PP 4.70.0 json_pp + src_remove_dual perl-core/Module-CoreList 5.202.304.230 corelist + src_remove_dual perl-core/Pod-Checker 1.740.0 podchecker + src_remove_dual perl-core/Pod-Perldoc 3.280.100 perldoc + src_remove_dual perl-core/Pod-Usage 2.10.0 pod2usage + src_remove_dual perl-core/Test-Harness 3.440.0 prove + src_remove_dual perl-core/podlators 4.140.0 pod2man pod2text + src_remove_dual_man perl-core/podlators 4.140.0 /usr/share/man/man1/perlpodstyle.1 +} + +check_rebuild() { + # Fresh install + if [[ -z "${REPLACING_VERSIONS}" ]]; then + return 0; + # Major Upgrade + # doesn't matter if there's multiple copies, it still needs a rebuild + # if the string is anything other than "5.CURRENTMAJOR" + elif [[ "${REPLACING_VERSIONS%.*}" != "${PV%.*}" ]]; then + echo "" + ewarn "UPDATE THE PERL MODULES:" + ewarn "After updating dev-lang/perl the installed Perl modules" + ewarn "have to be re-installed. In most cases, this is done automatically" + ewarn "by the package manager, but subsequent steps are still recommended" + ewarn "to ensure system consistency." + ewarn + ewarn "You should start with a depclean to remove any unused perl dependencies" + ewarn "that may confuse portage in future. Regular depcleans are also encouraged" + ewarn "as part of your regular update cycle, as that will keep perl upgrades working." + ewarn "Recommended: emerge --depclean -va" + ewarn + ewarn "You should then call perl-cleaner to clean up any old files and trigger any" + ewarn "remaining rebuilds portage may have missed." + ewarn "Use: perl-cleaner --all" + return 0; + + # Reinstall w/ USE Change + elif + ( use ithreads && ! has_version dev-lang/perl[ithreads] ) || \ + ( ! use ithreads && has_version dev-lang/perl[ithreads] ) || \ + ( use quadmath && ! has_version dev-lang/perl[quadmath] ) || \ + ( ! use quadmath && has_version dev-lang/perl[quadmath] ) || \ + ( use debug && ! has_version dev-lang/perl[debug] ) || \ + ( ! use debug && has_version dev-lang/perl[debug] ) ; then + echo "" + ewarn "TOGGLED USE-FLAGS WARNING:" + ewarn "You changed one of the use-flags ithreads, quadmath, or debug." + ewarn "You must rebuild all perl-modules installed." + ewarn "Use: perl-cleaner --modules ; perl-cleaner --force --libperl" + fi +} + +pkg_setup() { + case ${CHOST} in + *-freebsd*) osname="freebsd" ;; + *-dragonfly*) osname="dragonfly" ;; + *-netbsd*) osname="netbsd" ;; + *-openbsd*) osname="openbsd" ;; + *-darwin*) osname="darwin" ;; + *-solaris*) osname="solaris" ;; + *-cygwin*) osname="cygwin" ;; + *) osname="linux" ;; + esac + + myarch="${CHOST%%-*}-${osname}" + if use debug ; then + myarch+="-debug" + fi + if use quadmath ; then + myarch+="-quadmath" + fi + if use ithreads ; then + mythreading="-multi" + myarch+="-thread" + fi + + PRIV_BASE="/usr/$(get_libdir)/perl5" + SITE_BASE="/usr/local/$(get_libdir)/perl5" + VENDOR_BASE="/usr/$(get_libdir)/perl5/vendor_perl" + + LIBPERL="libperl$(get_libname ${MY_PV} )" + + PRIV_LIB="${PRIV_BASE}/${SUBSLOT}" + ARCH_LIB="${PRIV_BASE}/${SUBSLOT}/${myarch}${mythreading}" + SITE_LIB="${SITE_BASE}/${SUBSLOT}" + SITE_ARCH="${SITE_BASE}/${SUBSLOT}/${myarch}${mythreading}" + VENDOR_LIB="${VENDOR_BASE}/${SUBSLOT}" + VENDOR_ARCH="${VENDOR_BASE}/${SUBSLOT}/${myarch}${mythreading}" + + dual_scripts +} + +src_remove_dual_file() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + alternatives_auto_makesym "${i}" "${i}-[0-9]*" + done + ;; + setup) + for i in "$@" ; do + if [[ -f ${EROOT}${i} && ! -h ${EROOT}${i} ]] ; then + has_version ${pkg} && ewarn "You must reinstall ${pkg} !" + break + fi + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i}{,-${ver}-${P}} || die + done + ;; + esac +} + +src_remove_dual_man() { + local i pkg ver ff + pkg="$1" + ver="$2" + shift 2 + case "${EBUILD_PHASE:-none}" in + postinst|postrm) + for i in "$@" ; do + ff=`echo "${EROOT}${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}}"*` + ff=${ff##*${i#${i%.[0-9]}}} + alternatives_auto_makesym "${i}${ff}" "${i%.[0-9]}-[0-9]*" + done + ;; + install) + for i in "$@" ; do + if ! [[ -f "${ED}"${i} ]] ; then + ewarn "${i} does not exist!" + continue + fi + mv "${ED}"${i} "${ED}"${i%.[0-9]}-${ver}-${P}${i#${i%.[0-9]}} || die + done + ;; + esac +} + +src_remove_dual() { + local i pkg ver + pkg="$1" + ver="$2" + shift 2 + for i in "$@" ; do + src_remove_dual_file "${pkg}" "${ver}" "/usr/bin/${i}" + src_remove_dual_man "${pkg}" "${ver}" "/usr/share/man/man1/${i}.1" + done +} + +src_prepare_perlcross() { + cp -a ../perl-cross-${CROSS_VER}/* . || die + + # bug 794463, needs further analysis what is exactly wrong here + eapply "${FILESDIR}/perl-5.34.0-crossfit.patch" + + # bug 604072 + MAKEOPTS+=" -j1" + export MAKEOPTS +} + +src_prepare_dynamic() { + ln -s ${LIBPERL} libperl$(get_libname ${SHORT_PV}) || die + ln -s ${LIBPERL} libperl$(get_libname ) || die +} + +# Copy a patch into the patch series +# add_patch SRC_PATH DEST_NAME ['description'] ['bug'] ['bug'] +# - description is optional, but recommended +# - all arguments after descriptions are bug URLs +add_patch() { + local patchdir="${WORKDIR}/patches" + local infodir="${WORKDIR}/patch-info" + local src_name dest_name desc + src_name="$1" + dest_name="$2" + desc="$3" + shift; shift; shift; + einfo "Adding ${dest_name} to patch bundle" + cp "${src_name}" "${patchdir}/${dest_name}" || die "Couldn't copy ${src_name} to ${dest_name}" + if [[ -n "${desc}" ]]; then + printf "%s" "${desc}" > "${infodir}/${dest_name}.desc" || die "Couldn't write ${dest_name}.desc" + fi + if [[ $# -gt 0 ]]; then + # Note: when $@ is more than one element, this emits a + # line for each element + printf "%s\n" "$@" > "${infodir}/${dest_name}.bugs" || die "Couldn't write ${dest_name}.bugs" + fi +} + +# Remove a patch using a glob expr +# eg: +# rm_patch *-darwin-Use-CC* +# +rm_patch() { + local patchdir="${WORKDIR}/patches" + local expr="$1" + local patch="$( cd "${patchdir}"; echo $expr )" + einfo "Removing $patch ($expr) from patch bundle" + if [[ -e "${patchdir}/${patch}" ]]; then + rm -f "${patchdir}/${patch}" || die "Can't remove ${patch} ( $expr )" + else + ewarn "No ${expr} found in ${patchdir} to remove" + fi +} + +# Yes, this is a reasonable amount of code for something seemingly simple +# but this is far easier to debug when things go wrong, and things went wrong +# multiple times while I was getting the exact number of slashes right, which +# requires circumnavigating both bash and sed escape mechanisms. +c_escape_string() { + local slash dquote + slash='\' + dquote='"' + re_slash="${slash}${slash}" + re_dquote="${slash}${dquote}" + + # Convert \ to \\, + # " to \" + echo "$1" |\ + sed "s|${re_slash}|${re_slash}${re_slash}|g" |\ + sed "s|${re_dquote}|${re_slash}${re_dquote}|g" +} +c_escape_file() { + c_escape_string "$(cat "$1")" +} + +apply_patchdir() { + local patchdir="${WORKDIR}/patches" + local infodir="${WORKDIR}/patch-info" + local patchoutput="patchlevel-gentoo.h" + + # Inject Patch-Level info into description for patchlevel.h patch + # to show in -V + local patch_expr="*List-packaged-patches*" + local patch="$( cd "${patchdir}"; echo $patch_expr )"; + einfo "Injecting patch-level info into ${patch}.desc ( $patch_expr )" + + if [[ -e "${patchdir}/${patch}" ]]; then + printf "List packaged patches for %s(%s) in patchlevel.h" "${PF}" "${PATCH_BASE}"\ + >"${infodir}/${patch}.desc" || die "Can't rewrite ${patch}.desc" + else + eerror "No $patch_expr found in ${patchdir}" + fi + + # Compute patch list to apply + # different name other than PATCHES to stop default + # reapplying it + # Single depth is currently only supported, as artifacts can reside + # from the old layout being multiple-directories, as well as it grossly + # simplifying the patchlevel_gentoo.h generation. + local PERL_PATCHES=($( + find "${patchdir}" -maxdepth 1 -mindepth 1 -type f -printf "%f\n" |\ + grep -E '[.](diff|patch)$' |\ + sort -n + )) + + for patch in "${PERL_PATCHES[@]}"; do + eapply "${WORKDIR}"/patches/${patch} + done + + einfo "Generating $patchoutput" + + # This code creates a header file, each iteration + # creates one-or-more-lines for each entry found in PERL_PATCHES + # and STDOUT is redirected to the .h file + for patch in "${PERL_PATCHES[@]}"; do + local desc_f="${infodir}/${patch}.desc" + local bugs_f="${infodir}/${patch}.bugs" + + printf ',"%s"\n' "${patch}" + if [[ ! -e "${desc_f}" ]]; then + ewarn "No description provided for ${patch} (expected: ${desc_f} )" + else + local desc="$(c_escape_file "${desc_f}")" + printf ',"- %s"\n' "${desc}" + fi + if [[ -e "${bugs_f}" ]]; then + while read -d $'\n' -r line; do + local esc_line="$(c_escape_string "${line}")" + printf ',"- Bug: %s"\n' "${esc_line}" + done <"${bugs_f}" + fi + done > "${S}/${patchoutput}" + printf "%s\n" "${patchoutput}" >> "${S}/MANIFEST" + +} + +src_prepare() { + local patchdir="${WORKDIR}/patches" + + # Prepare Patch dir with additional patches / remove unwanted patches + # Inject bug/desc entries for perl -V + # Old example: + # add_patch "${FILESDIR}/${PN}-5.26.2-hppa.patch" "100-5.26.2-hppa.patch"\ + # "Fix broken miniperl on hppa"\ + # "https://bugs.debian.org/869122" "https://bugs.gentoo.org/634162" + + add_patch "${FILESDIR}/${PN}-5.36.1-http-tiny.patch" "0111-5.36.1-http-tiny.patch"\ + "Enable certificate checking in HTTP::Tiny by default"\ + "https://bugs.gentoo.org/905296" "https://bugs.debian.org/954089" + + if [[ ${CHOST} == *-solaris* ]] ; then + # do NOT mess with nsl, on Solaris this is always necessary, + # when -lsocket is used e.g. to get h_errno + rm_patch "*-nsl-and-cl*" + fi + + apply_patchdir + + tc-is-cross-compiler && src_prepare_perlcross + + tc-is-static-only || src_prepare_dynamic + + if use gdbm; then + sed -i "s:INC => .*:INC => \"-I${EROOT}/usr/include/gdbm\":g" \ + ext/NDBM_File/Makefile.PL || die + fi + + # Use errno.h from prefix rather than from host system, bug #645804 + if use prefix && [[ -e "${EPREFIX}"/usr/include/errno.h ]] ; then + 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 + + if [[ ${CHOST} == *-darwin* ]] ; then + # fix install_name (soname) not to reference $D + sed -i -e '/install_name `pwd/s/`pwd`/\\$(shrpdir)/' Makefile.SH || die + + # fix environ linkage absence (only a real issue on Darwin9) + if [[ ${CHOST##*-darwin} -le 9 ]] ; then + sed -i -e '/^PLDLFLAGS =/s/=/= -include crt_externs.h -Denviron="(*_NSGetEnviron())"/' \ + Makefile.SH || die + fi + fi + + default +} + +myconf() { + # the myconf array is declared in src_configure + myconf=( "${myconf[@]}" "$@" ) +} + +# Outputs a list of versions which have been seen in any of the +# primary perl @INC prefix paths, such as: +# /usr/lib64/perl5/ +# /usr/local/lib64/perl5/ +# /usr/lib64/perl5/vendor_perl/ +# +# All values of NUMBER must be like "5.x.y" or like "5.x" +# +find_candidate_inc_versions() { + local regex='.*/5[.][0-9]+\([.][0-9]+\|\)$' + local dirs=( + "${EROOT}${PRIV_BASE}" + "${EROOT}${SITE_BASE}" + "${EROOT}${VENDOR_BASE}" + ) + for dir in "${dirs[@]}"; do + if [[ ! -e "${dir}" ]]; then + continue + fi + # Without access to readdir() on these dirs, find will not be able + # to reveal any @INC directories inside them, and will subsequently prune + # them from the built perl's @INC support, breaking our compatiblity options + # entirely. + if [[ ! -r "${dir}" || ! -x "${dir}" ]]; then + eerror "Bad permissions on ${dir}, this will probably break things" + eerror "Ensure ${dir} is +rx for at least uid=$EUID" + eerror "Recommended permission is +rx for all" + eerror "> chmod o+rx ${dir}" + fi + done + einfo "Scanning for old @INC dirs matching '$regex' in: ${dirs[*]}" + find "${dirs[@]}" -maxdepth 1 -mindepth 1 -type d -regex "${regex}" -printf "%f " 2>/dev/null +} + +# Sort versions passed versiony-ly, remove self-version if present +# dedup. Takes each version as an argument +sanitize_inc_versions() { + local vexclude="${SUBSLOT}" + einfo "Normalizing/Sorting candidate list: $*" + einfo " to remove '${vexclude}'" + # Note, general numeric sort has to be used + # for the last component, or unique will convert + # 5.30.0 + 5.30 into just 5.30 + printf "%s\n" "$@" |\ + grep -vxF "${vexclude}" |\ + sort -u -nr -t'.' -k1,1rn -k2,2rn -k3,3rg +} + +versions_to_inclist() { + local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}" + + for v; do + has "${v}" ${oldv} && echo -n "${v}/${myarch}${mythreading}/ "; + echo -n "${v}/ "; + done +} + +versions_to_gentoolibdirs() { + local oldv="${DIST_VERSION%-RC} ${PERL_BIN_OLDVERSEN}" + local root + local v + for v; do + for root in "${PRIV_BASE}" "${VENDOR_BASE}" "${SITE_BASE}"; do + local fullpath="${EROOT}${root}/${v}" + if [[ -e "${fullpath}" ]]; then + has "${v}" ${oldv} && printf "%s:" "${fullpath}/${myarch}${mythreading}"; + printf "%s:" "${fullpath}" + fi + done + done +} + +src_configure() { + declare -a myconf + + export LC_ALL="C" + [[ ${COLUMNS:-1} -ge 1 ]] || unset COLUMNS # bug #394091 + + # Perl has problems compiling with -Os in your flags with glibc + replace-flags "-Os" "-O2" + + # xlocale.h is going away in glibc-2.26, so it's counterproductive + # if we use it and include it in CORE/perl.h ... Perl builds just + # fine with glibc and locale.h only. + # However, the darwin prefix people have no locale.h ... + use elibc_glibc && myconf -Ui_xlocale + + # This flag makes compiling crash in interesting ways + filter-flags "-malign-double" + + # Generic LTO broken since 5.28, triggers EUMM failures + filter-flags "-flto" + + use sparc && myconf -Ud_longdbl + + export BUILD_BZIP2=0 + export BZIP2_INCLUDE=${EROOT}/usr/include + export BZIP2_LIB=${EROOT}/usr/$(get_libdir) + + export BUILD_ZLIB=False + export ZLIB_INCLUDE=${EROOT}/usr/include + export ZLIB_LIB=${EROOT}/usr/$(get_libdir) + + # allow either gdbm to provide ndbm (in ) or db1 + myndbm='U' + mygdbm='U' + mydb='U' + if use gdbm ; then + mygdbm='D' + if use berkdb ; then + myndbm='D' + fi + fi + if use berkdb ; then + mydb='D' + has_version '=sys-libs/db-1*' && myndbm='D' + fi + + myconf "-${myndbm}i_ndbm" "-${mygdbm}i_gdbm" "-${mydb}i_db" + + if use alpha && [[ "$(tc-getCC)" = "ccc" ]] ; then + ewarn "Perl will not be built with berkdb support, use gcc if you needed it..." + myconf -Ui_db -Ui_ndbm + fi + + use ithreads && myconf -Dusethreads + + use quadmath && myconf -Dusequadmath + + if use debug ; then + append-cflags "-g" + myconf -DDEBUGGING + elif [[ ${CFLAGS} == *-g* ]] ; then + myconf -DDEBUGGING=-g + else + myconf -DDEBUGGING=none + fi + + # modifying 'optimize' prevents cross configure script from appending required flags + if tc-is-cross-compiler; then + append-cflags "-fwrapv" + fi + + # bug #877659, bug #821577 + append-cflags -fno-strict-aliasing + + # Autodiscover all old version directories, some of them will even be newer + # if you downgrade + if [[ -z ${PERL_OLDVERSEN} ]]; then + PERL_OLDVERSEN="$( find_candidate_inc_versions )" + fi + + # Fixup versions, removing self match, fixing order and dupes + PERL_OLDVERSEN="$( sanitize_inc_versions ${PERL_OLDVERSEN} )" + + # Experts who want a "Pure" install can set PERL_OLDVERSEN to an empty string + if [[ -n "${PERL_OLDVERSEN// }" ]]; then + local inclist="$( versions_to_inclist ${PERL_OLDVERSEN} )" + einfo "This version of perl may partially support modules previously" + einfo "installed in any of the following paths:" + for incpath in ${inclist}; do + [[ -e "${EROOT}${VENDOR_BASE}/${incpath}" ]] && einfo " ${EROOT}${VENDOR_BASE}/${incpath}" + [[ -e "${EROOT}${PRIV_BASE}/${incpath}" ]] && einfo " ${EROOT}${PRIV_BASE}/${incpath}" + [[ -e "${EROOT}${SITE_BASE}/${incpath}" ]] && einfo " ${EROOT}${SITE_BASE}/${incpath}" + done + einfo "This is a temporary measure and you should aim to cleanup these paths" + einfo "via world updates and perl-cleaner" + # myconf -Dinc_version_list="${inclist}" + myconf -Dgentoolibdirs="$( versions_to_gentoolibdirs ${PERL_OLDVERSEN} )" + fi + + [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" + + # Make sure we can do the final link #523730, need to set deployment + # target to override hardcoded 10.3 which breaks on modern OSX + [[ ${CHOST} == *-darwin* ]] && \ + myconf "-Dld=env MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} $(tc-getCC)" + + # Older macOS with non-Apple GCC chokes on inline in system headers + # using c89 mode as injected by cflags.SH, in addition, we override + # cflags, so we loose PERL_DARWIN which enables compat code that + # apparently on more recent macOS releases is no longer necessary + [[ ${CHOST} == *-darwin* && ${CHOST##*darwin} -le 9 ]] && tc-is-gcc && \ + append-cflags -Dinline=__inline__ -DPERL_DARWIN + + # flock on 32-bit sparc Solaris is broken, fall back to fcntl + [[ ${CHOST} == sparc-*-solaris* ]] && \ + myconf -Ud_flock + + # Prefix: the host system needs not to follow Gentoo multilib stuff, and in + # Prefix itself we don't do multilib either, so make sure perl can find + # something compatible. + if use prefix ; then + # Set a hook to check for each detected library whether it actually works. + export libscheck=" + ( echo 'main(){}' > '${T}'/conftest.c && + $(tc-getCC) -o '${T}'/conftest '${T}'/conftest.c -l\$thislib >/dev/null 2>/dev/null + ) || xxx=/dev/null" + + # Use all host paths that might contain useful stuff, the hook above will filter out bad choices. + local paths="/lib/*-linux-gnu /usr/lib/*-linux-gnu /lib64 /lib/64 /usr/lib64 /usr/lib/64 /lib32 /usr/lib32 /lib /usr/lib" + myconf "-Dlibpth=${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir) ${paths}" + elif [[ $(get_libdir) != "lib" ]] ; then + # We need to use " and not ', as the written config.sh use ' ... + myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" + fi + + # don't try building ODBM, bug #354453 + disabled_extensions="ODBM_File" + + if ! use gdbm ; then + # workaround for bug #157774: don't try building GDBM related stuff with USE="-gdbm" + disabled_extensions="${disabled_extensions} GDBM_File NDBM_File" + fi + + myconf -Dnoextensions="${disabled_extensions}" + + [[ "${PV##*.}" == "9999" ]] && myconf -Dusedevel -Uversiononly + + [[ -n "${EXTRA_ECONF}" ]] && ewarn During Perl build, EXTRA_ECONF=${EXTRA_ECONF} + # allow fiddling via EXTRA_ECONF, bug 558070 + eval "local -a EXTRA_ECONF=(${EXTRA_ECONF})" + + # setting -Dld= to tc-getLD breaks perl and all perl things + # https://github.com/Perl/perl5/issues/17791#issuecomment-630145202 + myconf \ + -Duseshrplib \ + -Darchname="${myarch}" \ + -Dcc="$(tc-getCC)" \ + -Dar="$(tc-getAR)" \ + -Dnm="$(tc-getNM)" \ + -Dcpp="$(tc-getCPP)" \ + -Dranlib="$(tc-getRANLIB)" \ + -Accflags="${CFLAGS}" \ + -Doptimize="${CFLAGS}" \ + -Dldflags="${LDFLAGS}" \ + -Dprefix="${EPREFIX}"'/usr' \ + -Dsiteprefix="${EPREFIX}"'/usr/local' \ + -Dvendorprefix="${EPREFIX}"'/usr' \ + -Dscriptdir="${EPREFIX}"'/usr/bin' \ + -Dprivlib="${EPREFIX}${PRIV_LIB}" \ + -Darchlib="${EPREFIX}${ARCH_LIB}" \ + -Dsitelib="${EPREFIX}${SITE_LIB}" \ + -Dsitearch="${EPREFIX}${SITE_ARCH}" \ + -Dvendorlib="${EPREFIX}${VENDOR_LIB}" \ + -Dvendorarch="${EPREFIX}${VENDOR_ARCH}" \ + -Dman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dsiteman1dir="${EPREFIX}"/usr/local/man/man1 \ + -Dsiteman3dir="${EPREFIX}"/usr/local/man/man3 \ + -Dvendorman1dir="${EPREFIX}"/usr/share/man/man1 \ + -Dvendorman3dir="${EPREFIX}"/usr/share/man/man3 \ + -Dman1ext='1' \ + -Dman3ext='3pm' \ + -Dlibperl="${LIBPERL}" \ + -Dlocincpth="${EPREFIX}"'/usr/include ' \ + -Dglibpth="${EPREFIX}/$(get_libdir) ${EPREFIX}/usr/$(get_libdir)"' ' \ + -Duselargefiles \ + -Dd_semctl_semun \ + -Dcf_by='Gentoo' \ + -Dmyhostname='localhost' \ + -Dperladmin='root@localhost' \ + -Ud_csh \ + -Dsh="${EPREFIX}"/bin/sh \ + -Dtargetsh="${EPREFIX}"/bin/sh \ + -Uusenm \ + "${EXTRA_ECONF[@]}" + + if tc-is-cross-compiler; then + ./configure \ + --target="${CHOST}" \ + --build="${CBUILD}" \ + -Dinstallprefix='' \ + -Dinstallusrbinperl='undef' \ + -Dusevendorprefix='define' \ + "${myconf[@]}" \ + || die "Unable to configure" + else + sh Configure \ + -des \ + -Dinstallprefix="${EPREFIX}"'/usr' \ + -Dinstallusrbinperl='n' \ + "${myconf[@]}" \ + || die "Unable to configure" + fi +} + +src_test() { + export NO_GENTOO_NETWORK_TESTS=1; + export GENTOO_ASSUME_SANDBOXED="${GENTOO_ASSUME_SANDBOXED:-1}" + export GENTOO_NO_PORTING_TESTS="${GENTOO_NO_PORTING_TESTS:-1}" + if [[ ${EUID} == 0 ]] ; then + ewarn "Test fails with a sandbox error (#328793) if run as root. Skipping tests..." + return 0 + fi + TEST_JOBS="$(makeopts_jobs)" make test_harness || die "test failed" +} + +src_install() { + local i + local coredir="${ARCH_LIB}/CORE" + + emake DESTDIR="${D}" install + + rm -f "${ED}/usr/bin/perl${MY_PV}" + ln -s perl "${ED}"/usr/bin/perl${MY_PV} || die + + if ! tc-is-static-only ; then + dolib.so "${ED}"${coredir}/${LIBPERL} + rm -f "${ED}"${coredir}/${LIBPERL} + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ${LIBPERL} "${ED}"/usr/$(get_libdir)/libperl$(get_libname) || die + + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/${LIBPERL} || die + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname ${SHORT_PV}) || die + ln -sf ../../../../${LIBPERL} "${ED}"${coredir}/libperl$(get_libname) || die + fi + + rm -rf "${ED}"/usr/share/man/man3 || die "Unable to remove module man pages" + + # This removes ${D} from Config.pm + for i in $(find "${D}" -iname "Config.pm" ) ; do + einfo "Removing ${D} from ${i}..." + sed -i -e "s:${D}::" "${i}" || die "Sed failed" + done + + dodoc Changes* README AUTHORS + + if use doc ; then + # HTML Documentation + # We expect errors, warnings, and such with the following. + + dodir /usr/share/doc/${PF}/html + LD_LIBRARY_PATH=. ./perl installhtml \ + --podroot='.' \ + --podpath='lib:ext:pod:vms' \ + --recurse \ + --htmldir="${ED}/usr/share/doc/${PF}/html" + fi + + [[ -d ${ED}/usr/local ]] && rm -r "${ED}"/usr/local + + dual_scripts +} + +pkg_preinst() { + check_rebuild +} + +pkg_postinst() { + dual_scripts + + if [[ -z "${ROOT}" ]] ; then + local INC DIR file + INC=$(perl -e 'for $line (@INC) { next if $line eq "."; next if $line =~ m/'${SHORT_PV}'|etc|local|perl$/; print "$line\n" }') + einfo "Removing old .ph files" + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + for file in $(find "${DIR}" -name "*.ph" -type f ) ; do + rm -f "${file}" + einfo "<< ${file}" + done + fi + done + # Silently remove the now empty dirs + for DIR in ${INC} ; do + if [[ -d "${DIR}" ]] ; then + find "${DIR}" -depth -type d -print0 | xargs -0 -r rmdir &> /dev/null + fi + done + + fi +} + +pkg_postrm() { + dual_scripts +} -- cgit v1.2.3