summaryrefslogtreecommitdiff
path: root/dev-lang/ghc
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-04-28 20:21:43 +0100
commit40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-lang/ghc
parent8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-lang/ghc')
-rw-r--r--dev-lang/ghc/Manifest6
-rw-r--r--dev-lang/ghc/ghc-8.10.4.ebuild20
-rw-r--r--dev-lang/ghc/ghc-8.8.4.ebuild23
-rw-r--r--dev-lang/ghc/ghc-9.0.1.ebuild20
4 files changed, 59 insertions, 10 deletions
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index df45f4d6a9fb..ec022d9c9260 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -22,7 +22,7 @@ DIST ghc-bin-8.8.4-i686-pc-linux-gnu.tbz2 120336081 BLAKE2B 55dfbb90d5e55c2af5e9
DIST ghc-bin-8.8.4-x86_64-pc-linux-gnu.tbz2 118897883 BLAKE2B a180b2dd1a3bc222044ece809ad700aee29d0c3e75b57ee9af3ca33c9c0f59dbf36f68202f746d99f80915cb717a9c41fc12db507f1cb469981732703a06b9cc SHA512 9d4be02dbd9704c93ef18feb92ea30bd5d590df31f288bf1b364818424c5019ca9ada26eec88418199f90ae8f4459d0a9352104e3f3186bbdc241891eb1b66c4
DIST ghc-bin-9.0.1-i686-pc-linux-gnu.tbz2 122955511 BLAKE2B b870f46cc78fcc1d715aafe7108951582cfd12495b4e9d804d4b66562c66a6a2b2d9513031aedc8f3630a0cdbb3257943304b05732301a084f89487452f2f2d9 SHA512 aafd4233c40f93b71e6ac1acc8a75e30d49b826e4bce6d9832836966fd5f6c4898963bd4c2f34577f4199c1d9a3f537ac1e7d87eab11e9fb5e849573580ed3fb
DIST ghc-bin-9.0.1-x86_64-pc-linux-gnu.tbz2 121542968 BLAKE2B 837870e68138f8d97dc8b2aae90090cf02416628602ca4ba4417ac92b49155f10028b05ac465665b8872b32372a5cee075616983f2eacdebb0188bd2ce6a93d2 SHA512 0e8c6d2e6f32fac95588f7323a4e02dddfc9ec2476a82b97bf5a106d3810f7e638fda7124c53b5bbc563fce70f4436553c282d8ea2f1f5fdf4fcccfb15a2b079
-EBUILD ghc-8.10.4.ebuild 25830 BLAKE2B aa68b44948d22cfe476851427bf2bbd3b1257a6ad120ef8612e867ba81c2cff2b12974c82a36d52af5ed5c5fbe6ae3f74a12aa278af6b05ce3356f775c131016 SHA512 c6587aeec865a92f00fc5b967ef9bf87f8a0fafe86516b5d3b4a76d6017c409f521cf2af39e08aacb3b38230f069a72db38be0f923b83f60b221ed82ee133ca0
-EBUILD ghc-8.8.4.ebuild 26410 BLAKE2B f49c37a85a76a0edcbb7a253ef2a1c49291919e89ac933a0da5ac29dba29d16944f0e310c2a7426b4ebe800f2f1c405fbbac69b32217330b5d295efc9bac97e3 SHA512 b6a8f90a0f2b1ada7878696c7e937253c9e7dfea551bdf44b328f0ddcc0416facad4168c0a528d4d3f8235c4cad14da8903062cf887193cc15ca152dd8b860c1
-EBUILD ghc-9.0.1.ebuild 25788 BLAKE2B 8a90d51d7cad901e3477c592f0e4397f0b9d6e682557539ba3c3146e0509dfb387457bbe24ed8f80da1ac03c6abe314ed1fa42466339202b81de1cead3a6473c SHA512 dea79fa098fe288a07c7c29913dd32c80b246c91c6f83be5f4878e9cbb69aefdd1f8d75f34bfbed30fa1286892efdf70060b133cb0916c4d4cbca46ca9e4e0dd
+EBUILD ghc-8.10.4.ebuild 26084 BLAKE2B a6d1b21fd9563c1b938b1603e52974c5d48c349952b7f1cac400e67a5f0ec14be9970b8f78133cc305cb48e1b742f02dd21075c52f6672956d99823e289070b2 SHA512 04ea85fc82670629675684fd82720e1677b8611ac5c02d94b9031ff28368c4d47c471eb1d71a4c1a7979718cfb749a986742d02f41bcfd3ca85c47c6a7b4d040
+EBUILD ghc-8.8.4.ebuild 26719 BLAKE2B 548af06ceb26ceff32e7b311108078c7a16077d0ad9e54419177930ef45a31d1d1e9fe1bcd827f626e51187b7676bcbdb84340243605884f56582d3a9535b2ed SHA512 5c61720081a5c8cc7d9810fb5cd7554392ba91a71fa0ba6fa9000ab989fe6894c789e08128ca3cb84bdbafa6fae6b45c8464512560afd12554740438609760c3
+EBUILD ghc-9.0.1.ebuild 26042 BLAKE2B bd86239c2be8bc5bd3ae1c1b376f456c9317d182fe3c020ec2b7adf220c3037554d1f7d20f355465bd483c0bc9d65db12f574e3c90840cf5f75ef9643652b935 SHA512 3fa72c4a8b7b86110a2f5e72d07912e152147d1f3612a8dc726062e554b3591ab2cc888c1fc781f190db7a83e98a5d8bd2843870f06d051d8be11c8762ac29e5
MISC metadata.xml 877 BLAKE2B 763db2ffce8c241ef55110ca08aa9f7383f14bbe7f96a443b438f027214e04f56f8216b0cd0d871e516a13f07a8a5a52835b0f75ddd3eb9ebd7faccd3a6b03d9 SHA512 516ad3cdb3b26b242668ae2bbf48628c8fb95fdc84ab3dc00afc940c68c2b78a7aa85634c228e9b3427963f0b86263d24ba043d0fd9ae57752e5075392a0322c
diff --git a/dev-lang/ghc/ghc-8.10.4.ebuild b/dev-lang/ghc/ghc-8.10.4.ebuild
index 7257681ccbe7..3e4cfb0d0db8 100644
--- a/dev-lang/ghc/ghc-8.10.4.ebuild
+++ b/dev-lang/ghc/ghc-8.10.4.ebuild
@@ -13,6 +13,8 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then
fi
fi
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
inherit multilib multiprocessing pax-utils toolchain-funcs prefix
inherit check-reqs
@@ -105,13 +107,23 @@ PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
doc? ( app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-python/sphinx
>=dev-libs/libxslt-1.1.2 )
- !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+ test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+ # test driver is written in python
+ use test && return 0
+ return 1
+}
# we build binaries without profiling support
REQUIRED_USE="
@@ -379,6 +391,10 @@ pkg_setup() {
die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
fi
fi
+
+ if needs_python; then
+ python-any-r1_pkg_setup
+ fi
}
src_unpack() {
diff --git a/dev-lang/ghc/ghc-8.8.4.ebuild b/dev-lang/ghc/ghc-8.8.4.ebuild
index 0ad88139e259..8bf1fa84bbb7 100644
--- a/dev-lang/ghc/ghc-8.8.4.ebuild
+++ b/dev-lang/ghc/ghc-8.8.4.ebuild
@@ -13,6 +13,8 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then
fi
fi
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
inherit multilib multiprocessing pax-utils toolchain-funcs prefix
inherit check-reqs
@@ -104,13 +106,23 @@ PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
doc? ( app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-python/sphinx
>=dev-libs/libxslt-1.1.2 )
- !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+ test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+ # test driver is written in python
+ use test && return 0
+ return 1
+}
# we build binaries without profiling support
REQUIRED_USE="
@@ -388,6 +400,10 @@ pkg_setup() {
die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
fi
fi
+
+ if needs_python; then
+ python-any-r1_pkg_setup
+ fi
}
src_unpack() {
@@ -435,6 +451,7 @@ src_prepare() {
pushd "${WORKDIR}"/ghc-bin-installer > /dev/null || die
use sparc-solaris && unpack ghc-6.10.4-sparc-sun-solaris2.tar.bz2
use x86-solaris && unpack ghc-7.0.3-i386-unknown-solaris2.tar.bz2
+ use x86-macos && unpack ghc-7.4.1-i386-apple-darwin.tar.bz2
use x64-macos && unpack ghc-7.4.1-x86_64-apple-darwin.tar.bz2
popd > /dev/null
@@ -639,7 +656,7 @@ src_configure() {
# using ${GTARGET}'s libffi is not supported yet:
# GHC embeds full path for ffi includes without /usr/${CTARGET} account.
econf_args+=(--with-system-libffi)
- econf_args+=(--with-ffi-includes=$($(tc-getPKG_CONFIG) libffi --cflags-only-I | sed -e 's@^-I@@'))
+ econf_args+=(--with-ffi-includes=$(pkg-config libffi --cflags-only-I | sed -e 's@^-I@@'))
fi
einfo "Final mk/build.mk:"
diff --git a/dev-lang/ghc/ghc-9.0.1.ebuild b/dev-lang/ghc/ghc-9.0.1.ebuild
index e9b2703051b9..9f33f2d0b49d 100644
--- a/dev-lang/ghc/ghc-9.0.1.ebuild
+++ b/dev-lang/ghc/ghc-9.0.1.ebuild
@@ -13,6 +13,8 @@ if [[ ${CTARGET} = ${CHOST} ]] ; then
fi
fi
+PYTHON_COMPAT=( python3_{7..9} )
+inherit python-any-r1
inherit autotools bash-completion-r1 eutils flag-o-matic ghc-package
inherit multilib multiprocessing pax-utils toolchain-funcs prefix
inherit check-reqs
@@ -105,13 +107,23 @@ PREBUILT_BINARY_RDEPENDS="${PREBUILT_BINARY_DEPENDS}
RDEPEND+="binary? ( ${PREBUILT_BINARY_RDEPENDS} )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+ virtual/pkgconfig
doc? ( app-text/docbook-xml-dtd:4.2
app-text/docbook-xml-dtd:4.5
app-text/docbook-xsl-stylesheets
dev-python/sphinx
>=dev-libs/libxslt-1.1.2 )
- !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )"
+ !ghcbootstrap? ( ${PREBUILT_BINARY_DEPENDS} )
+ test? ( ${PYTHON_DEPS} )
+"
+
+needs_python() {
+ # test driver is written in python
+ use test && return 0
+ return 1
+}
# we build binaries without profiling support
REQUIRED_USE="
@@ -379,6 +391,10 @@ pkg_setup() {
die "No binary available for '${ARCH}' arch yet, USE=ghcbootstrap"
fi
fi
+
+ if needs_python; then
+ python-any-r1_pkg_setup
+ fi
}
src_unpack() {