dev-libs/openssl: fix broken prefix support

Commit ed7230d4486049fdd155ac6b86e07578d624aeb0 has broken prefix
support which this commit will fix.

Closes: https://bugs.gentoo.org/665272
Package-Manager: Portage-2.3.48, Repoman-2.3.10

diff --git a/dev-libs/openssl/openssl-1.0.2p.ebuild b/dev-libs/openssl/openssl-1.0.2p.ebuild
index ddc45aa8700b58fe8777c766d78865321260156d..ef70b21c1d74b262c58f0706a7697030c22737f1 100644 (file)
--- a/dev-libs/openssl/openssl-1.0.2p.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2p.ebuild
@@ -239,10 +239,10 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-       # We need to create $D/usr on our own to avoid a race condition #665130
-       if [[ ! -d "${D%/}/usr" ]]; then
+       # We need to create $ED/usr on our own to avoid a race condition #665130
+       if [[ ! -d "${ED%/}/usr" ]]; then
                # We can only create this directory once
-               mkdir "${D%/}"/usr || die
+               mkdir "${ED%/}"/usr || die
        fi
 
        emake INSTALL_PREFIX="${D%/}" install

diff --git a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
index e694ab91d16739850879d37b7877502e2e9dddc7..4c92eedb393af1fb93dabb1e6a1c928fe3deddf3 100644 (file)
--- a/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1_pre9.ebuild
@@ -185,13 +185,13 @@ multilib_src_test() {
 }
 
 multilib_src_install() {
-       # We need to create $D/usr on our own to avoid a race condition #665130
-       if [[ ! -d "${D%/}/usr" ]]; then
+       # We need to create $ED/usr on our own to avoid a race condition #665130
+       if [[ ! -d "${ED%/}/usr" ]]; then
                # We can only create this directory once
-               mkdir "${D%/}"/usr || die
+               mkdir "${ED%/}"/usr || die
        fi
 
-       emake DESTDIR="${D%}" install
+       emake DESTDIR="${D%/}" install
 }
 
 multilib_src_install_all() {