| 1 |
commit: c7d77d4129e3715eee8ee8fae1bf42bd7744ac19 |
| 2 |
Author: Julius Putra Tanu Setiaji <indocomsoft <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed May 1 09:08:29 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 09:40:45 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d77d41 |
| 7 |
|
| 8 |
dev-lang/erlang: Fix based on old ebuild files |
| 9 |
|
| 10 |
* Change ${ED} to ${D} as emake INSTALL_PREFIX as in the old ebuild |
| 11 |
* Remove empty ssl-rpath in econfigure, and re-add the path to OpenSSL |
| 12 |
library in "use_with ssl" |
| 13 |
|
| 14 |
Signed-off-by: Julius Putra Tanu Setiaji <indocomsoft <AT> gmail.com> |
| 15 |
Closes: https://bugs.gentoo.org/684816 |
| 16 |
Package-Manager: Portage-2.3.66, Repoman-2.3.12 |
| 17 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 18 |
|
| 19 |
dev-lang/erlang/erlang-21.1.1.ebuild | 5 ++--- |
| 20 |
dev-lang/erlang/erlang-21.2.6.ebuild | 5 ++--- |
| 21 |
dev-lang/erlang/erlang-21.2.7.ebuild | 5 ++--- |
| 22 |
dev-lang/erlang/erlang-21.3.ebuild | 5 ++--- |
| 23 |
4 files changed, 8 insertions(+), 12 deletions(-) |
| 24 |
|
| 25 |
diff --git a/dev-lang/erlang/erlang-21.1.1.ebuild b/dev-lang/erlang/erlang-21.1.1.ebuild |
| 26 |
index d18a1dd37f6..803c9286f09 100644 |
| 27 |
--- a/dev-lang/erlang/erlang-21.1.1.ebuild |
| 28 |
+++ b/dev-lang/erlang/erlang-21.1.1.ebuild |
| 29 |
@@ -70,8 +70,7 @@ src_configure() { |
| 30 |
$(use_with java javac) |
| 31 |
$(use_with odbc) |
| 32 |
$(use_enable sctp) |
| 33 |
- $(use_with ssl) |
| 34 |
- $(usex ssl "--with-ssl-rpath" "") |
| 35 |
+ $(use_with ssl ssl "${EPREFIX}"/usr) |
| 36 |
$(use_enable ssl dynamic-ssl-lib) |
| 37 |
$(use_enable systemd) |
| 38 |
$(use_enable pgo) |
| 39 |
@@ -113,7 +112,7 @@ src_install() { |
| 40 |
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" |
| 41 |
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" |
| 42 |
|
| 43 |
- emake INSTALL_PREFIX="${ED}" install |
| 44 |
+ emake INSTALL_PREFIX="${D}" install |
| 45 |
|
| 46 |
if use doc ; then |
| 47 |
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) |
| 48 |
|
| 49 |
diff --git a/dev-lang/erlang/erlang-21.2.6.ebuild b/dev-lang/erlang/erlang-21.2.6.ebuild |
| 50 |
index c6f58edf023..ec653705b1a 100644 |
| 51 |
--- a/dev-lang/erlang/erlang-21.2.6.ebuild |
| 52 |
+++ b/dev-lang/erlang/erlang-21.2.6.ebuild |
| 53 |
@@ -70,8 +70,7 @@ src_configure() { |
| 54 |
$(use_with java javac) |
| 55 |
$(use_with odbc) |
| 56 |
$(use_enable sctp) |
| 57 |
- $(use_with ssl) |
| 58 |
- $(usex ssl "--with-ssl-rpath" "") |
| 59 |
+ $(use_with ssl ssl "${EPREFIX}"/usr) |
| 60 |
$(use_enable ssl dynamic-ssl-lib) |
| 61 |
$(use_enable systemd) |
| 62 |
$(use_enable pgo) |
| 63 |
@@ -113,7 +112,7 @@ src_install() { |
| 64 |
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" |
| 65 |
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" |
| 66 |
|
| 67 |
- emake INSTALL_PREFIX="${ED}" install |
| 68 |
+ emake INSTALL_PREFIX="${D}" install |
| 69 |
|
| 70 |
if use doc ; then |
| 71 |
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) |
| 72 |
|
| 73 |
diff --git a/dev-lang/erlang/erlang-21.2.7.ebuild b/dev-lang/erlang/erlang-21.2.7.ebuild |
| 74 |
index c6f58edf023..ec653705b1a 100644 |
| 75 |
--- a/dev-lang/erlang/erlang-21.2.7.ebuild |
| 76 |
+++ b/dev-lang/erlang/erlang-21.2.7.ebuild |
| 77 |
@@ -70,8 +70,7 @@ src_configure() { |
| 78 |
$(use_with java javac) |
| 79 |
$(use_with odbc) |
| 80 |
$(use_enable sctp) |
| 81 |
- $(use_with ssl) |
| 82 |
- $(usex ssl "--with-ssl-rpath" "") |
| 83 |
+ $(use_with ssl ssl "${EPREFIX}"/usr) |
| 84 |
$(use_enable ssl dynamic-ssl-lib) |
| 85 |
$(use_enable systemd) |
| 86 |
$(use_enable pgo) |
| 87 |
@@ -113,7 +112,7 @@ src_install() { |
| 88 |
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" |
| 89 |
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" |
| 90 |
|
| 91 |
- emake INSTALL_PREFIX="${ED}" install |
| 92 |
+ emake INSTALL_PREFIX="${D}" install |
| 93 |
|
| 94 |
if use doc ; then |
| 95 |
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) |
| 96 |
|
| 97 |
diff --git a/dev-lang/erlang/erlang-21.3.ebuild b/dev-lang/erlang/erlang-21.3.ebuild |
| 98 |
index c6f58edf023..ec653705b1a 100644 |
| 99 |
--- a/dev-lang/erlang/erlang-21.3.ebuild |
| 100 |
+++ b/dev-lang/erlang/erlang-21.3.ebuild |
| 101 |
@@ -70,8 +70,7 @@ src_configure() { |
| 102 |
$(use_with java javac) |
| 103 |
$(use_with odbc) |
| 104 |
$(use_enable sctp) |
| 105 |
- $(use_with ssl) |
| 106 |
- $(usex ssl "--with-ssl-rpath" "") |
| 107 |
+ $(use_with ssl ssl "${EPREFIX}"/usr) |
| 108 |
$(use_enable ssl dynamic-ssl-lib) |
| 109 |
$(use_enable systemd) |
| 110 |
$(use_enable pgo) |
| 111 |
@@ -113,7 +112,7 @@ src_install() { |
| 112 |
[[ -z "${erl_erts_ver}" ]] && die "Couldn't determine erts version" |
| 113 |
[[ -z "${erl_interface_ver}" ]] && die "Couldn't determine interface version" |
| 114 |
|
| 115 |
- emake INSTALL_PREFIX="${ED}" install |
| 116 |
+ emake INSTALL_PREFIX="${D}" install |
| 117 |
|
| 118 |
if use doc ; then |
| 119 |
local DOCS=( "AUTHORS" "HOWTO"/* "README.md" "CONTRIBUTING.md" "${WORKDIR}"/doc/. "${WORKDIR}"/lib/. "${WORKDIR}"/erts-* ) |
Archives