From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86EE2139694 for ; Thu, 13 Apr 2017 18:34:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CE93E0C09; Thu, 13 Apr 2017 18:34:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 36A9BE0C09 for ; Thu, 13 Apr 2017 18:34:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AE3DD341130 for ; Thu, 13 Apr 2017 18:34:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86D507410 for ; Thu, 13 Apr 2017 18:34:02 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1492108433.75fd7d4a801fbfce3449e6987f0a58700f8dac98.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/rhash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/rhash/rhash-1.3.4.ebuild X-VCS-Directories: app-crypt/rhash/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 75fd7d4a801fbfce3449e6987f0a58700f8dac98 X-VCS-Branch: master Date: Thu, 13 Apr 2017 18:34:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3a5b4012-26c5-47d6-9a39-43e69ba8d075 X-Archives-Hash: d5ff7218c1967e138aac7a4da1fc6cb0 commit: 75fd7d4a801fbfce3449e6987f0a58700f8dac98 Author: Fabian Groffen gentoo org> AuthorDate: Thu Apr 13 18:33:43 2017 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Apr 13 18:33:53 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75fd7d4a app-crypt/rhash: fix and keyword for Solaris Package-Manager: Portage-2.3.3, Repoman-2.3.1 app-crypt/rhash/rhash-1.3.4.ebuild | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app-crypt/rhash/rhash-1.3.4.ebuild b/app-crypt/rhash/rhash-1.3.4.ebuild index 3a58d6df434..2be1edde5f3 100644 --- a/app-crypt/rhash/rhash-1.3.4.ebuild +++ b/app-crypt/rhash/rhash-1.3.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" IUSE="debug nls openssl static-libs" RDEPEND="openssl? ( dev-libs/openssl:0=[${MULTILIB_USEDEP}] )" @@ -29,8 +29,7 @@ src_prepare() { sed -i -e 's:\$(DESTDIR)/etc:\$(DESTDIR)/$(SYSCONFDIR):g' Makefile || die if [[ ${CHOST} == *-darwin* ]] ; then - local - ver_script='-Wl,--version-script,exports.sym,-soname,$(SONAME)' + 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/' \ -e '/^SOLINK/s/\.so/.dylib/' \ @@ -39,6 +38,12 @@ src_prepare() { Makefile || die fi + if [[ ${CHOST} == *-solaris* ]] ; 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 + fi + multilib_copy_sources } @@ -53,7 +58,8 @@ multilib_src_compile() { $(use openssl && echo -ldl) ) - [[ ${CHOST} == *-darwin* ]] && ADDLDFLAGS+=( $(use nls && echo -lintl) ) + [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] \ + && ADDLDFLAGS+=( $(use nls && echo -lintl) ) emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" \ ADDCFLAGS="${ADDCFLAGS[*]}" ADDLDFLAGS="${ADDLDFLAGS[*]}" \