public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Keri Harris" <keri@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/
Date: Sat, 21 Mar 2020 16:40:31 +0000 (UTC)	[thread overview]
Message-ID: <1584808807.7552050bc2dd61db07500ff962fff4ce75bd26f3.keri@gentoo> (raw)

commit:     7552050bc2dd61db07500ff962fff4ce75bd26f3
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 16:39:45 2020 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> 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 <keri <AT> 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"


             reply	other threads:[~2020-03-21 16:40 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-21 16:40 Keri Harris [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-15  1:39 [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury-extras/ Eli Schwartz
2024-10-14  5:28 Eli Schwartz
2024-06-30 20:18 Florian Schmaus
2024-06-30 20:18 Florian Schmaus
2024-06-08  7:57 Miroslav Šulc
2022-10-08 20:01 Sam James
2022-08-14 15:18 Keri Harris
2022-05-22 16:24 Keri Harris
2022-05-15 10:54 Keri Harris
2022-05-14 18:31 Keri Harris
2021-10-03 11:11 Keri Harris
2021-06-18 21:07 David Seifert
2021-01-18 16:04 Keri Harris
2021-01-07  7:25 Keri Harris
2020-09-15 11:07 Keri Harris
2020-09-13 10:48 Keri Harris
2020-07-26 13:37 Keri Harris
2020-07-23 11:43 Keri Harris
2020-07-19 20:27 Keri Harris
2020-04-02  9:38 Keri Harris
2020-04-01 10:37 Keri Harris
2020-03-29 10:43 Keri Harris
2020-03-21 17:17 Keri Harris
2020-02-12 18:06 David Seifert
2019-04-15 11:45 Keri Harris
2018-10-27  6:58 Keri Harris
2018-09-09 22:49 Thomas Deutschmann
2018-09-03 12:49 Keri Harris
2018-07-17 11:58 Keri Harris
2017-09-30 11:35 Keri Harris
2017-09-28  6:47 Keri Harris
2017-09-27 18:57 Keri Harris
2017-09-27  7:36 Keri Harris
2017-09-26 19:59 Keri Harris
2017-09-26 19:09 Keri Harris
2017-09-26 17:30 Keri Harris
2017-09-25 10:43 Keri Harris
2017-01-23 15:46 Agostino Sarubbo
2017-01-23 13:51 Agostino Sarubbo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1584808807.7552050bc2dd61db07500ff962fff4ce75bd26f3.keri@gentoo \
    --to=keri@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox