| 1 |
commit: 75fd7d4a801fbfce3449e6987f0a58700f8dac98 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 13 18:33:43 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 13 18:33:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75fd7d4a |
| 7 |
|
| 8 |
app-crypt/rhash: fix and keyword for Solaris |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
app-crypt/rhash/rhash-1.3.4.ebuild | 14 ++++++++++---- |
| 13 |
1 file changed, 10 insertions(+), 4 deletions(-) |
| 14 |
|
| 15 |
diff --git a/app-crypt/rhash/rhash-1.3.4.ebuild b/app-crypt/rhash/rhash-1.3.4.ebuild |
| 16 |
index 3a58d6df434..2be1edde5f3 100644 |
| 17 |
--- a/app-crypt/rhash/rhash-1.3.4.ebuild |
| 18 |
+++ b/app-crypt/rhash/rhash-1.3.4.ebuild |
| 19 |
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" |
| 20 |
|
| 21 |
LICENSE="MIT" |
| 22 |
SLOT="0" |
| 23 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x64-macos ~x86-macos" |
| 24 |
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" |
| 25 |
IUSE="debug nls openssl static-libs" |
| 26 |
|
| 27 |
RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )" |
| 28 |
@@ -29,8 +29,7 @@ src_prepare() { |
| 29 |
sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die |
| 30 |
|
| 31 |
if [[ ${CHOST} == *-darwin* ]] ; then |
| 32 |
- local |
| 33 |
- ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' |
| 34 |
+ local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' |
| 35 |
local install_name='-install_name $(LIBDIR)/$(SONAME)' |
| 36 |
sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \ |
| 37 |
-e '/^SOLINK/s/\.so/.dylib/' \ |
| 38 |
@@ -39,6 +38,12 @@ src_prepare() { |
| 39 |
Makefile || die |
| 40 |
fi |
| 41 |
|
| 42 |
+ if [[ ${CHOST} == *-solaris* ]] ; then |
| 43 |
+ # https://sourceware.org/bugzilla/show_bug.cgi?id=12548 |
| 44 |
+ # skip the export.sym for now |
| 45 |
+ sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die |
| 46 |
+ fi |
| 47 |
+ |
| 48 |
multilib_copy_sources |
| 49 |
} |
| 50 |
|
| 51 |
@@ -53,7 +58,8 @@ multilib_src_compile() { |
| 52 |
$(use openssl && echo -ldl) |
| 53 |
) |
| 54 |
|
| 55 |
- [[ ${CHOST} == *-darwin* ]] && ADDLDFLAGS+=( $(use nls && echo -lintl) ) |
| 56 |
+ [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \ |
| 57 |
+ && ADDLDFLAGS+=( $(use nls && echo -lintl) ) |
| 58 |
|
| 59 |
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ |
| 60 |
ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \ |
Archives