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 C3540138350 for ; Sat, 21 Mar 2020 16:40:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 02C9FE0B29; Sat, 21 Mar 2020 16:40:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C78B9E0B29 for ; Sat, 21 Mar 2020 16:40:34 +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 E6DAF34F1B8 for ; Sat, 21 Mar 2020 16:40:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7ECD21B0 for ; Sat, 21 Mar 2020 16:40:31 +0000 (UTC) From: "Keri Harris" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Keri Harris" Message-ID: <1584808807.7552050bc2dd61db07500ff962fff4ce75bd26f3.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mercury-extras/Manifest dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild X-VCS-Directories: dev-lang/mercury-extras/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: 7552050bc2dd61db07500ff962fff4ce75bd26f3 X-VCS-Branch: master Date: Sat, 21 Mar 2020 16:40:31 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 848e1a38-1ba0-4a25-8d3d-7950321f7e2a X-Archives-Hash: a94af862dded60f9afc726ede2738f14 commit: 7552050bc2dd61db07500ff962fff4ce75bd26f3 Author: Keri Harris gentoo org> AuthorDate: Sat Mar 21 16:39:45 2020 +0000 Commit: Keri Harris gentoo org> CommitDate: Sat Mar 21 16:40:07 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7552050b dev-lang/mercury-extras: fix ml compatibility with 17.1 profiles Signed-off-by: Keri Harris gentoo.org> Package-Manager: Portage-2.3.89, Repoman-2.3.11 dev-lang/mercury-extras/Manifest | 2 +- dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-lang/mercury-extras/Manifest b/dev-lang/mercury-extras/Manifest index ba011a040ba..6d6a7049d18 100644 --- a/dev-lang/mercury-extras/Manifest +++ b/dev-lang/mercury-extras/Manifest @@ -1,2 +1,2 @@ -DIST mercury-extras-14.01.1-gentoo-patchset-2.tar.gz 4021 BLAKE2B 6fd5551ec01dd7303a8e1c5661ebec5e33226c1604955f4f69d15e532744584d50bb6cb0e2939c87fd62eb10b1f2f394425ef88cab3e96b81a08a3dcbe695059 SHA512 947ce6fabf661e431f53e4f0a4679eea3ee3fa0c2c585b51cb8b5c9dff98d75697654d5860db3364203e0e657c4d5f68cae1bca469bd0b3f7de9583e97413529 +DIST mercury-extras-14.01.1-gentoo-patchset-3.tar.gz 3891 BLAKE2B dfec573f14070cfddb2cd47178d92cc42e59dfc7cfaeef77654d255ed074ed40e3b704e0f7c6889b8ffa82d75ebf4f5907ac2b91642f8a0ff738e5ee085237be SHA512 05bbdf95192746bd4e478c47258f5c7e1dae0e2b8d34ae6283304b47ba902183e0a416ec08bfd031d6ed486e51e52de338ef312f8ad790dd91678c4b28730b47 DIST mercury-srcdist-14.01.1.tar.gz 52658945 BLAKE2B 6497921a0227b9a6fbcbabdd309ef3325f32dda14fc4ddb443368385b89be4011d677a24b30b3702147d1b782fe2597760ad66dd34503aa6aebaf79707466529 SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c diff --git a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild index 6fc2a533fc9..e2dabd39840 100644 --- a/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild +++ b/dev-lang/mercury-extras/mercury-extras-14.01.1.ebuild @@ -5,7 +5,7 @@ EAPI=5 inherit eutils multilib vcs-clean -PATCHSET_VER="2" +PATCHSET_VER="3" MY_P=mercury-srcdist-${PV} DESCRIPTION="Additional libraries and tools that are not part of the Mercury standard library" @@ -92,8 +92,8 @@ src_compile() { SUBDIRS="${MERCURY_PKGS}" \ EXTRA_MLFLAGS=--no-strip \ EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ + EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ + EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ || die "mmake failed" if use cairo; then @@ -111,8 +111,8 @@ src_install() { SUBDIRS="${MERCURY_PKGS}" \ EXTRA_MLFLAGS=--no-strip \ EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_LD_LIBFLAGS="${LDFLAGS}" \ + EXTRA_LDFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ + EXTRA_LD_LIBFLAGS="${LDFLAGS} -L/usr/$(get_libdir)" \ DESTDIR="${D}" \ INSTALL_PREFIX="${D}"/usr \ install || die "mmake install failed"