From: James Le Cuirot Date: Sat, 2 Sep 2017 12:36:39 +0000 (+0100) Subject: app-crypt/rhash: Use elibc USE flags instead of CHOST for fixes X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=2b37168745eee2cc9ec0defacab07bae17ea771a;p=gentoo.git app-crypt/rhash: Use elibc USE flags instead of CHOST for fixes This is more accurate. Package-Manager: Portage-2.3.8, Repoman-2.3.2 --- diff --git a/app-crypt/rhash/rhash-1.3.5.ebuild b/app-crypt/rhash/rhash-1.3.5.ebuild index e1ea23cd4fc4..77b468a64c52 100644 --- a/app-crypt/rhash/rhash-1.3.5.ebuild +++ b/app-crypt/rhash/rhash-1.3.5.ebuild @@ -27,7 +27,7 @@ src_prepare() { # Install /etc stuff inside the Prefix sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die - if [[ ${CHOST} == *-darwin* ]] ; then + if use elibc_Darwin ; then local ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' local install_name='-install_name $(LIBDIR)/$(SONAME)' sed -i -e '/^\(SONAME\|SHAREDLIB\)/s/\.so\.\([0-9]\+\)/.\1.dylib/' \ @@ -37,7 +37,7 @@ src_prepare() { Makefile || die fi - if [[ ${CHOST} == *-solaris* ]] ; then + if use elibc_SunOS ; then # https://sourceware.org/bugzilla/show_bug.cgi?id=12548 # skip the export.sym for now sed -i -e 's/,--version-script,exports.sym//' librhash/Makefile || die @@ -57,8 +57,8 @@ multilib_src_compile() { $(use openssl && echo -ldl) ) - [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \ - && ADDLDFLAGS+=( $(use nls && echo -lintl) ) + use elibc_Darwin || use elibc_SunOS && + ADDLDFLAGS+=( $(use nls && echo -lintl) ) emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \