From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF913158089 for ; Thu, 19 Oct 2023 14:58:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D97E02BC156; Thu, 19 Oct 2023 14:58:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C138F2BC156 for ; Thu, 19 Oct 2023 14:58:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A0243335D1C for ; Thu, 19 Oct 2023 14:58:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 247F6128D for ; Thu, 19 Oct 2023 14:58:09 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1697727446.d716abadd69d784837ea07e792e09a81d3aaafb1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.0.2u-r1.ebuild dev-libs/openssl/openssl-1.1.1u.ebuild dev-libs/openssl/openssl-1.1.1w.ebuild dev-libs/openssl/openssl-3.0.10.ebuild dev-libs/openssl/openssl-3.0.11.ebuild dev-libs/openssl/openssl-3.0.9-r1.ebuild dev-libs/openssl/openssl-3.0.9-r2.ebuild dev-libs/openssl/openssl-3.1.2.ebuild dev-libs/openssl/openssl-3.1.3.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d716abadd69d784837ea07e792e09a81d3aaafb1 X-VCS-Branch: master Date: Thu, 19 Oct 2023 14:58:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c216edb6-1843-4d21-9c78-68d97c3b2e50 X-Archives-Hash: 2d6844e926735db5483a43d1abc1600e commit: d716abadd69d784837ea07e792e09a81d3aaafb1 Author: Sam James gentoo org> AuthorDate: Thu Oct 19 14:56:32 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 19 14:57:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d716abad dev-libs/openssl: pass -j1 for install See https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 - upstream say parallelism isn't supported for the install targets. Bug: https://github.com/openssl/openssl/issues/21999 Signed-off-by: Sam James gentoo.org> dev-libs/openssl/openssl-1.0.2u-r1.ebuild | 4 +++- dev-libs/openssl/openssl-1.1.1u.ebuild | 8 +++++--- dev-libs/openssl/openssl-1.1.1w.ebuild | 8 +++++--- dev-libs/openssl/openssl-3.0.10.ebuild | 10 ++++++---- dev-libs/openssl/openssl-3.0.11.ebuild | 10 ++++++---- dev-libs/openssl/openssl-3.0.9-r1.ebuild | 8 ++++---- dev-libs/openssl/openssl-3.0.9-r2.ebuild | 10 ++++++---- dev-libs/openssl/openssl-3.1.2.ebuild | 10 ++++++---- dev-libs/openssl/openssl-3.1.3.ebuild | 10 ++++++---- 9 files changed, 47 insertions(+), 31 deletions(-) diff --git a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild index 77d0b75e9fe5..a76877972d3a 100644 --- a/dev-libs/openssl/openssl-1.0.2u-r1.ebuild +++ b/dev-libs/openssl/openssl-1.0.2u-r1.ebuild @@ -248,7 +248,9 @@ multilib_src_install() { mkdir "${ED}"/usr || die fi - emake INSTALL_PREFIX="${D}" install + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake INSTALL_PREFIX="${D}" -j1 install # This is crappy in that the static archives are still built even # when USE=static-libs. But this is due to a failing in the openssl diff --git a/dev-libs/openssl/openssl-1.1.1u.ebuild b/dev-libs/openssl/openssl-1.1.1u.ebuild index c90541dca291..c8d53908be94 100644 --- a/dev-libs/openssl/openssl-1.1.1u.ebuild +++ b/dev-libs/openssl/openssl-1.1.1u.ebuild @@ -223,11 +223,13 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-1.1.1w.ebuild b/dev-libs/openssl/openssl-1.1.1w.ebuild index 7440cf3d3dcc..17d784938024 100644 --- a/dev-libs/openssl/openssl-1.1.1w.ebuild +++ b/dev-libs/openssl/openssl-1.1.1w.ebuild @@ -223,11 +223,13 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} MANSUFFIX=ssl -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-3.0.10.ebuild b/dev-libs/openssl/openssl-3.0.10.ebuild index b469b0b55dc6..9759230620fb 100644 --- a/dev-libs/openssl/openssl-3.0.10.ebuild +++ b/dev-libs/openssl/openssl-3.0.10.ebuild @@ -221,16 +221,18 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if use fips; then - emake DESTDIR="${D}" install_fips + emake DESTDIR="${D}" -j1 install_fips # Regen this in pkg_preinst, bug 900625 rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-3.0.11.ebuild b/dev-libs/openssl/openssl-3.0.11.ebuild index b469b0b55dc6..9759230620fb 100644 --- a/dev-libs/openssl/openssl-3.0.11.ebuild +++ b/dev-libs/openssl/openssl-3.0.11.ebuild @@ -221,16 +221,18 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if use fips; then - emake DESTDIR="${D}" install_fips + emake DESTDIR="${D}" -j1 install_fips # Regen this in pkg_preinst, bug 900625 rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-3.0.9-r1.ebuild b/dev-libs/openssl/openssl-3.0.9-r1.ebuild index 766737ef1a4b..70b659682512 100644 --- a/dev-libs/openssl/openssl-3.0.9-r1.ebuild +++ b/dev-libs/openssl/openssl-3.0.9-r1.ebuild @@ -221,16 +221,16 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + emake DESTDIR="${D}" -j1 install_sw if use fips; then - emake DESTDIR="${D}" install_fips + emake DESTDIR="${D}" -j1 install_fips # Regen this in pkg_preinst, bug 900625 rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-3.0.9-r2.ebuild b/dev-libs/openssl/openssl-3.0.9-r2.ebuild index 72845dd2599a..49b80ff8b1c9 100644 --- a/dev-libs/openssl/openssl-3.0.9-r2.ebuild +++ b/dev-libs/openssl/openssl-3.0.9-r2.ebuild @@ -226,16 +226,18 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if use fips; then - emake DESTDIR="${D}" install_fips + emake DESTDIR="${D}" -j1 install_fips # Regen this in pkg_preinst, bug 900625 rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-3.1.2.ebuild b/dev-libs/openssl/openssl-3.1.2.ebuild index 67cd58d980dc..a89ece323f28 100644 --- a/dev-libs/openssl/openssl-3.1.2.ebuild +++ b/dev-libs/openssl/openssl-3.1.2.ebuild @@ -224,16 +224,18 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if use fips; then - emake DESTDIR="${D}" install_fips + emake DESTDIR="${D}" -j1 install_fips # Regen this in pkg_preinst, bug 900625 rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs fi # This is crappy in that the static archives are still built even diff --git a/dev-libs/openssl/openssl-3.1.3.ebuild b/dev-libs/openssl/openssl-3.1.3.ebuild index 67cd58d980dc..a89ece323f28 100644 --- a/dev-libs/openssl/openssl-3.1.3.ebuild +++ b/dev-libs/openssl/openssl-3.1.3.ebuild @@ -224,16 +224,18 @@ multilib_src_test() { } multilib_src_install() { - emake DESTDIR="${D}" install_sw + # Only -j1 is supported for the install targets: + # https://github.com/openssl/openssl/issues/21999#issuecomment-1771150305 + emake DESTDIR="${D}" -j1 install_sw if use fips; then - emake DESTDIR="${D}" install_fips + emake DESTDIR="${D}" -j1 install_fips # Regen this in pkg_preinst, bug 900625 rm "${ED}${SSL_CNF_DIR}"/fipsmodule.cnf || die fi if multilib_is_native_abi; then - emake DESTDIR="${D}" install_ssldirs - emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} install_docs + emake DESTDIR="${D}" -j1 install_ssldirs + emake DESTDIR="${D}" DOCDIR='$(INSTALLTOP)'/share/doc/${PF} -j1 install_docs fi # This is crappy in that the static archives are still built even