| 1 |
commit: 2b37168745eee2cc9ec0defacab07bae17ea771a |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 2 12:36:39 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 2 12:38:40 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b371687 |
| 7 |
|
| 8 |
app-crypt/rhash: Use elibc USE flags instead of CHOST for fixes |
| 9 |
|
| 10 |
This is more accurate. |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.8, Repoman-2.3.2 |
| 13 |
|
| 14 |
app-crypt/rhash/rhash-1.3.5.ebuild | 8 ++++---- |
| 15 |
1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild |
| 18 |
index e1ea23cd4fc..77b468a64c5 100644 |
| 19 |
--- a/app-crypt/rhash/rhash-1.3.5.ebuild |
| 20 |
+++ b/app-crypt/rhash/rhash-1.3.5.ebuild |
| 21 |
@@ -27,7 +27,7 @@ src_prepare() { |
| 22 |
# Install /etc stuff inside the Prefix |
| 23 |
sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die |
| 24 |
|
| 25 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 26 |
+ if use elibc_Darwin ; then |
| 27 |
local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' |
| 28 |
local install_name='-install_name $(LIBDIR)/$(SONAME)' |
| 29 |
sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \ |
| 30 |
@@ -37,7 +37,7 @@ src_prepare() { |
| 31 |
Makefile || die |
| 32 |
fi |
| 33 |
|
| 34 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 35 |
+ if use elibc_SunOS ; then |
| 36 |
# https://sourceware.org/bugzilla/show_bug.cgi?id=12548 |
| 37 |
# skip the export.sym for now |
| 38 |
sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die |
| 39 |
@@ -57,8 +57,8 @@ multilib_src_compile() { |
| 40 |
$(use openssl && echo -ldl) |
| 41 |
) |
| 42 |
|
| 43 |
- [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \ |
| 44 |
- && ADDLDFLAGS+=( $(use nls && echo -lintl) ) |
| 45 |
+ use elibc_Darwin || use elibc_SunOS && |
| 46 |
+ ADDLDFLAGS+=( $(use nls && echo -lintl) ) |
| 47 |
|
| 48 |
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ |
| 49 |
ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \ |
Archives