| 1 |
commit: eeeab1a8ebfb0d3ac9c34bdf0eb272d68ef6e672 |
| 2 |
Author: Keri Harris <keri <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 1 16:26:16 2017 +0000 |
| 4 |
Commit: Keri Harris <keri <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 1 16:26:34 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeeab1a8 |
| 7 |
|
| 8 |
dev-lang/mercury: use Mmake.params to specify CFLAGS/LDFLAGS |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.8, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-lang/mercury/Manifest | 2 +- |
| 13 |
dev-lang/mercury/mercury-14.01.1.ebuild | 32 +++++++++++++++----------------- |
| 14 |
2 files changed, 16 insertions(+), 18 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lang/mercury/Manifest b/dev-lang/mercury/Manifest |
| 17 |
index 760f43cd5a0..b72dce975f5 100644 |
| 18 |
--- a/dev-lang/mercury/Manifest |
| 19 |
+++ b/dev-lang/mercury/Manifest |
| 20 |
@@ -1,6 +1,6 @@ |
| 21 |
DIST mercury-13.05.2-gentoo-patchset-1.tar.gz 5622 SHA256 5a6559c207c0161beef2eb3bce6f890eadab7dd8fbc5909dc720085498c51777 SHA512 387956a120b2bbb7da1913e89cf33e7bdb8f205fe207701a33d19ccb667d1ae73a342955642120822448621bdba349ab628290d78fdef35c08b9ccbadda4177f WHIRLPOOL 9da5ec0cc6dba6f0ed98c77583213852bc94014c584eae22705c282cbdc137ee30efd83401f8e28c6320a4909c9abbc6d0cf8e79e953c2ce4cfd504156267c82 |
| 22 |
DIST mercury-14.01-gentoo-patchset-0.tar.gz 5728 SHA256 43fc8145e784b9e09561fd2b7268cfd37151b134203785b9256b4b7fd87e3d13 SHA512 f1e375ac192e478a82863aa7b8e28c1044a490c41bb63f7842b16b12b7cfa9c85938eacad4c3eacf348aafd42dfaa0dea5324b734d0d2a7454e3e9334369658e WHIRLPOOL eaad62d89285404518e3dca7f98065eea5aaa2f8b46d8ff0f01a0a6b6f886db51800faab81b4e1cd89cd61b771d65562a75f28c399aef053e730d7975ac8f8b6 |
| 23 |
-DIST mercury-14.01.1-gentoo-patchset-0.tar.gz 4701 SHA256 f85eafed1ba9276986d37aa6fd0e1792037c9a6e42009626791cb1bc8a07c8a9 SHA512 5b9afda5361ce68b3c39e15764bfd066eff032b9e1a67d3a53f438b60c92841f304456c0ae7bfe04a7dec35c1c00a3bdd88afc62392814eea5565c1e1c90b129 WHIRLPOOL ab6c8746d5f4ffc0edac7623c6deecc65629fa09a5b8e02f101f65fa8cd54702a9a450c999bfd90f5a3177864f85648814604adf540e2344ff79711c828d6b61 |
| 24 |
+DIST mercury-14.01.1-gentoo-patchset-1.tar.gz 4397 SHA256 734ff72c9172f21e9299b553b1d4768515009db66fda183ef2f16e9edb7ff77f SHA512 6b4908e620d60c1745e311ac95336a008656c16a426b697c68cd417ba7eef8f9664f4c7b46e410fc33cfbc4655b8a2ff6ab48fdd979c6197b585c58a6e0346dd WHIRLPOOL 132fd89972c3628fa50862a6d6e134fc8d896f09e6d9241e65157e83ad1ddcdfdcc5d3ba74795e8ba98a771954311d6b0be6512528a3e5fc437e7446bad33447 |
| 25 |
DIST mercury-srcdist-13.05.2.tar.gz 53847394 SHA256 8491cf419b996a315bf8664154dd91aed940274ded98e3aded733dbe1939f95f SHA512 2298804d3a04bca6be4bd3046643c7c0d0b22c447423017869cd9bf3a4fb6ec9fd29b5d8e1a386d5d52d07be5cad73608f1fcacf46732a7add93a01dcd199c08 WHIRLPOOL 2a81bebfd4b97b9bb1b0e174025e6050149c8e5f812cd97cbdc41818faa18c15f9494925f1f320682087cc45264bc00db07bef6862afef12317f77cc169a7f86 |
| 26 |
DIST mercury-srcdist-14.01.1.tar.gz 52658945 SHA256 98f7cbde7a7425365400feef3e69f1d6a848b25dc56ba959050523d546c4e88b SHA512 a128ef0fd4955abadea32019ec59297ffe32537415f32e9e948cbc1c3439bb40eb09de77569690fb18dd7d6969a2b1141b3ae5baeb87f2627eaa65ad93add92c WHIRLPOOL 7b859eb5c7c1194d63c0aeeeeac3686c57436100b5618ae31a901119a33443363acb80a908a15dfdfa8b61fd9ccb4e552cbb972a3cc735b7a768ee7c9b1b6091 |
| 27 |
DIST mercury-srcdist-14.01.tar.gz 52683989 SHA256 4446b7b4eafd35540495ef90ce93b71cb88efa2d744628aee80f76a694aefcc1 SHA512 77f61df64fc150e08f191860f285b97d11a71a52eabc95f660b3c90d88f8ee71d1227f7ab4b8be78be9d4aa3d62a260a874020023e4795da4cfd2e6fefa9965f WHIRLPOOL a7123063590e39ae15222eb59a2c3681ae37bea211967c857eb8725090d342f0aba7a55446529f8608afb9895746581943527b1b3c313c5cbb96f638a3377404 |
| 28 |
|
| 29 |
diff --git a/dev-lang/mercury/mercury-14.01.1.ebuild b/dev-lang/mercury/mercury-14.01.1.ebuild |
| 30 |
index d500a59e179..8bc496d6371 100644 |
| 31 |
--- a/dev-lang/mercury/mercury-14.01.1.ebuild |
| 32 |
+++ b/dev-lang/mercury/mercury-14.01.1.ebuild |
| 33 |
@@ -5,7 +5,7 @@ EAPI=5 |
| 34 |
|
| 35 |
inherit autotools elisp-common eutils flag-o-matic java-pkg-opt-2 multilib xdg-utils |
| 36 |
|
| 37 |
-PATCHSET_VER="0" |
| 38 |
+PATCHSET_VER="1" |
| 39 |
MY_P=${PN}-srcdist-${PV} |
| 40 |
|
| 41 |
DESCRIPTION="Mercury is a modern general-purpose logic/functional programming language" |
| 42 |
@@ -69,12 +69,14 @@ src_configure() { |
| 43 |
} |
| 44 |
|
| 45 |
src_compile() { |
| 46 |
+ # Prepare mmake flags |
| 47 |
+ echo "EXTRA_CFLAGS = ${CFLAGS}" >> Mmake.params |
| 48 |
+ echo "EXTRA_LDFLAGS = ${LDFLAGS}" >> Mmake.params |
| 49 |
+ echo "EXTRA_MLFLAGS = --no-strip" >> Mmake.params |
| 50 |
+ |
| 51 |
# Build Mercury using bootstrap grade |
| 52 |
emake \ |
| 53 |
PARALLEL="${MAKEOPTS}" \ |
| 54 |
- EXTRA_CFLAGS="${CFLAGS}" \ |
| 55 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 56 |
- EXTRA_MLFLAGS="--no-strip" \ |
| 57 |
|| die "emake failed" |
| 58 |
|
| 59 |
# We can now patch .m Mercury compiler files since we |
| 60 |
@@ -93,9 +95,6 @@ src_compile() { |
| 61 |
# Rebuild Mercury compiler using the just built mercury_compiler |
| 62 |
emake \ |
| 63 |
PARALLEL="${MAKEOPTS}" \ |
| 64 |
- EXTRA_CFLAGS="${CFLAGS}" \ |
| 65 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 66 |
- EXTRA_MLFLAGS="--no-strip" \ |
| 67 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 68 |
compiler || die "emake compiler failed" |
| 69 |
|
| 70 |
@@ -104,9 +103,6 @@ src_compile() { |
| 71 |
# the default grade now |
| 72 |
emake \ |
| 73 |
PARALLEL="${MAKEOPTS}" \ |
| 74 |
- EXTRA_CFLAGS="${CFLAGS}" \ |
| 75 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 76 |
- EXTRA_MLFLAGS="--no-strip" \ |
| 77 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 78 |
default_grade || die "emake default_grade failed" |
| 79 |
} |
| 80 |
@@ -123,8 +119,16 @@ src_test() { |
| 81 |
fi |
| 82 |
|
| 83 |
cd "${S}"/tests || die |
| 84 |
- sed -e "s:@WORKSPACE@:${TWS}:" < WS_FLAGS.ws > WS_FLAGS \ |
| 85 |
+ sed -e "s:@WORKSPACE@:${TWS}:" \ |
| 86 |
+ < WS_FLAGS.ws \ |
| 87 |
+ > WS_FLAGS \ |
| 88 |
+ || die "sed WORKSPACE failed" |
| 89 |
+ sed -e "s:@WORKSPACE@:${TWS}:" \ |
| 90 |
+ < .mgnuc_copts.ws \ |
| 91 |
+ > .mgnuc_copts \ |
| 92 |
|| die "sed WORKSPACE failed" |
| 93 |
+ find . -mindepth 1 -type d -exec cp .mgnuc_opts {} \; |
| 94 |
+ find . -mindepth 1 -type d -exec cp .mgnuc_copts {} \; |
| 95 |
|
| 96 |
# Mercury tests must be run in C locale since Mercury output is |
| 97 |
# compared to hard-coded warnings/errors |
| 98 |
@@ -137,18 +141,12 @@ src_test() { |
| 99 |
MMAKE_DIR="${TWS}"/scripts \ |
| 100 |
MERCURY_SUPPRESS_STACK_TRACE=yes \ |
| 101 |
GRADE=${TEST_GRADE} \ |
| 102 |
- MERCURY_ALL_LOCAL_C_INCL_DIRS=" -I${TWS}/boehm_gc/include \ |
| 103 |
- -I${TWS}/runtime \ |
| 104 |
- -I${TWS}/library" \ |
| 105 |
mmake || die "mmake test failed" |
| 106 |
} |
| 107 |
|
| 108 |
src_install() { |
| 109 |
emake \ |
| 110 |
PARALLEL="${MAKEOPTS}" \ |
| 111 |
- EXTRA_CFLAGS="${CFLAGS}" \ |
| 112 |
- EXTRA_LDFLAGS="${LDFLAGS}" \ |
| 113 |
- EXTRA_MLFLAGS="--no-strip" \ |
| 114 |
MERCURY_COMPILER="${S}"/compiler/mercury_compile \ |
| 115 |
DESTDIR="${D}" \ |
| 116 |
INSTALL_PREFIX="${D}"/usr \ |
Archives