summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2018-09-05 16:03:19 +0200
committerThomas Deutschmann <whissi@gentoo.org>2018-09-05 16:03:59 +0200
commitd0c2e3314fb21e805502c41e23b6e6e784389d63 (patch)
treea5f10bbd06e31e2dbfc84ccf90017da62b4385f3 /dev-libs/openssl
parentnet-misc/chrony: systemd changes/fixes (diff)
downloadgentoo-d0c2e3314fb21e805502c41e23b6e6e784389d63.tar.gz
gentoo-d0c2e3314fb21e805502c41e23b6e6e784389d63.tar.bz2
gentoo-d0c2e3314fb21e805502c41e23b6e6e784389d63.zip
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
Diffstat (limited to 'dev-libs/openssl')
-rw-r--r--dev-libs/openssl/openssl-1.0.2p.ebuild6
-rw-r--r--dev-libs/openssl/openssl-1.1.1_pre9.ebuild8
2 files changed, 7 insertions, 7 deletions
diff --git a/dev-libs/openssl/openssl-1.0.2p.ebuild b/dev-libs/openssl/openssl-1.0.2p.ebuild
index ddc45aa8700b..ef70b21c1d74 100644
--- 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 e694ab91d167..4c92eedb393a 100644
--- 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() {