commit: d716abadd69d784837ea07e792e09a81d3aaafb1 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Oct 19 14:56:32 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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
