Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/rhash/
Date: Thu, 22 Mar 2018 21:07:13
Message-Id: 1521752765.00de856ef8bed699cf27efa738c705d929e2786e.chewi@gentoo
1 commit: 00de856ef8bed699cf27efa738c705d929e2786e
2 Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
3 AuthorDate: Thu Mar 22 07:55:12 2018 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 22 21:06:05 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00de856e
7
8 app-crypt/rhash: pass --target=${CHOST} to configure
9
10 Without this change, app-crypt/rhash when built with a mingw-w64
11 crossdev toolchain ends up with the various rhash binaries being PE32
12 binaries without an '*.exe' extension and librhash having a '*.so'
13 extension, also a PE32 library, and no import library ('*.dll.a').
14
15 Package-Manager: Portage-2.3.24, Repoman-2.3.6
16 Closes: https://github.com/gentoo/gentoo/pull/7548
17
18 app-crypt/rhash/rhash-1.3.6-r1.ebuild | 6 ++++--
19 1 file changed, 4 insertions(+), 2 deletions(-)
20
21 diff --git a/app-crypt/rhash/rhash-1.3.6-r1.ebuild b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
22 index affa8241147..69f97e6e47a 100644
23 --- a/app-crypt/rhash/rhash-1.3.6-r1.ebuild
24 +++ b/app-crypt/rhash/rhash-1.3.6-r1.ebuild
25 @@ -34,6 +34,7 @@ src_prepare() {
26 multilib_src_configure() {
27 set -- \
28 ./configure \
29 + --target="${CHOST}" \
30 --cc="$(tc-getCC)" \
31 --ar="$(tc-getAR)" \
32 --extra-cflags="${CFLAGS}" \
33 @@ -59,8 +60,9 @@ multilib_src_configure() {
34 multilib_src_install() {
35 # -j1 needed due to race condition.
36 emake DESTDIR="${D}" -j1 \
37 - install{,-lib-so-link,-pkg-config} \
38 - $(use nls && echo install-gmo)
39 + install{,-pkg-config} \
40 + $(use nls && echo install-gmo) \
41 + $(use kernel_Winnt || echo install-lib-so-link)
42
43 emake DESTDIR="${D}" -j1 \
44 -C lib${PN} install-headers