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 7D9281396D0 for ; Sun, 1 Oct 2017 16:26:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC14F2BC002; Sun, 1 Oct 2017 16:26:57 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 9FDDA2BC002 for ; Sun, 1 Oct 2017 16:26:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 930343416BA for ; Sun, 1 Oct 2017 16:26:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3736A73E3 for ; Sun, 1 Oct 2017 16:26:54 +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: <1506875194.eeeab1a8ebfb0d3ac9c34bdf0eb272d68ef6e672.keri@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/mercury/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/mercury/Manifest dev-lang/mercury/mercury-14.01.1.ebuild X-VCS-Directories: dev-lang/mercury/ X-VCS-Committer: keri X-VCS-Committer-Name: Keri Harris X-VCS-Revision: eeeab1a8ebfb0d3ac9c34bdf0eb272d68ef6e672 X-VCS-Branch: master Date: Sun, 1 Oct 2017 16:26:54 +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: a3b91ac4-e86c-4b69-8cd6-a32fe48071c5 X-Archives-Hash: 4305b586f299c7b70c5c5386bd8317cb commit: eeeab1a8ebfb0d3ac9c34bdf0eb272d68ef6e672 Author: Keri Harris gentoo org> AuthorDate: Sun Oct 1 16:26:16 2017 +0000 Commit: Keri Harris gentoo org> CommitDate: Sun Oct 1 16:26:34 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeeab1a8 dev-lang/mercury: use Mmake.params to specify CFLAGS/LDFLAGS Package-Manager: Portage-2.3.8, Repoman-2.3.1 dev-lang/mercury/Manifest | 2 +- dev-lang/mercury/mercury-14.01.1.ebuild | 32 +++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest index 760f43cd5a0..b72dce975f5 100644 --- a/dev-lang/mercury/Manifest +++ b/dev-lang/mercury/Manifest @@ -1,6 +1,6 @@ DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 SHA256 5a6559c207c0161beef2eb3bce6f890eadab7dd8fbc5909dc720085498c51777 SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f WHIRLPOOL 9da5ec0cc6dba6f0ed98c77583213852bc94014c584eae22705c282cbdc137ee30efd83401f8e28c6320a4909c9abbc6d0cf8e79e953c2ce4cfd504156267c82 DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6 -DIST mercury-14.01.1-gentoo-patchset-0.tar.gz 4701 SHA256 f85eafed1ba9276986d37aa6fd0e1792037c9a6e42009626791cb1bc8a07c8a9 SHA512 5b9afda5361ce68b3c39e15764bfd066eff032b9e1a67d3a53f438b60c92841f304456c0ae7bfe04a7dec35c1c00a3bdd88afc62392814eea5565c1e1c90b129 WHIRLPOOL ab6c8746d5f4ffc0edac7623c6deecc65629fa09a5b8e02f101f65fa8cd54702a9a450c999bfd90f5a3177864f85648814604adf540e2344ff79711c828d6b61 +DIST mercury-14.01.1-gentoo-patchset-1.tar.gz 4397 SHA256 734ff72c9172f21e9299b553b1d4768515009db66fda183ef2f16e9edb7ff77f SHA512 6b4908e620d60c1745e311ac95336a008656c16a426b697c68cd417ba7eef8f9664f4c7b46e410fc33cfbc4655b8a2ff6ab48fdd979c6197b585c58a6e0346dd WHIRLPOOL 132fd89972c3628fa50862a6d6e134fc8d896f09e6d9241e65157e83ad1ddcdfdcc5d3ba74795e8ba98a771954311d6b0be6512528a3e5fc437e7446bad33447 DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86 DIST mercury-srcdist-14.01.1.tar.gz 52658945 SHA256 98f7cbde7a7425365400feef3e69f1d6a848b25dc56ba959050523d546c4e88b SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c WHIRLPOOL 7b859eb5c7c1194d63c0aeeeeac3686c57436100b5618ae31a901119a33443363acb80a908a15dfdfa8b61fd9ccb4e552cbb972a3cc735b7a768ee7c9b1b6091 DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404 diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild index d500a59e179..8bc496d6371 100644 --- a/dev-lang/mercury/mercury-14.01.1.ebuild +++ b/dev-lang/mercury/mercury-14.01.1.ebuild @@ -5,7 +5,7 @@ EAPI=5 inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils -PATCHSET_VER="0" +PATCHSET_VER="1" MY_P=${PN}-srcdist-${PV} DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" @@ -69,12 +69,14 @@ src_configure() { } src_compile() { + # Prepare mmake flags + echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params + echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params + echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params + # Build Mercury using bootstrap grade emake \ PARALLEL="${MAKEOPTS}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_MLFLAGS="--no-strip" \ || die "emake failed" # We can now patch .m Mercury compiler files since we @@ -93,9 +95,6 @@ src_compile() { # Rebuild Mercury compiler using the just built mercury_compiler emake \ PARALLEL="${MAKEOPTS}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_MLFLAGS="--no-strip" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ compiler || die "emake compiler failed" @@ -104,9 +103,6 @@ src_compile() { # the default grade now emake \ PARALLEL="${MAKEOPTS}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_MLFLAGS="--no-strip" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ default_grade || die "emake default_grade failed" } @@ -123,8 +119,16 @@ src_test() { fi cd "${S}"/tests || die - sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \ + sed -e "s:@WORKSPACE@:${TWS}:" \ + < WS_FLAGS.ws \ + > WS_FLAGS \ + || die "sed WORKSPACE failed" + sed -e "s:@WORKSPACE@:${TWS}:" \ + < .mgnuc_copts.ws \ + > .mgnuc_copts \ || die "sed WORKSPACE failed" + find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \; + find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \; # Mercury tests must be run in C locale since Mercury output is # compared to hard-coded warnings/errors @@ -137,18 +141,12 @@ src_test() { MMAKE_DIR="${TWS}"/scripts \ MERCURY_SUPPRESS_STACK_TRACE=yes \ GRADE=${TEST_GRADE} \ - MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \ - -I${TWS}/runtime \ - -I${TWS}/library" \ mmake || die "mmake test failed" } src_install() { emake \ PARALLEL="${MAKEOPTS}" \ - EXTRA_CFLAGS="${CFLAGS}" \ - EXTRA_LDFLAGS="${LDFLAGS}" \ - EXTRA_MLFLAGS="--no-strip" \ MERCURY_COMPILER="${S}"/compiler/mercury_compile \ DESTDIR="${D}" \ INSTALL_PREFIX="${D}"/usr \