[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/
commit: acc130ae2b9d811437a7b3b42bc9c8786c9d26fd Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 18 17:21:25 2024 + Commit: Conrad Kostecki gentoo org> CommitDate: Sat Jun 22 18:50:37 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc130ae dev-lang/ocaml: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> dev-lang/ocaml/files/ocaml-4.14.0-clang.patch | 132 -- 1 file changed, 132 deletions(-) diff --git a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch b/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch deleted file mode 100644 index cd3c042f2639.. --- a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch +++ /dev/null @@ -1,132 +0,0 @@ -commit 28b553622bd0f168411d86ddcfba1adab0d87b92 -Author: Yawar Amin -Date: Mon Nov 15 22:40:43 2021 -0500 - -Fix ranlib error - -- Always pass ranlib one file argument at a time to avoid error 'Exactly - one archive should be specified' -- Call ranlib without cd'ing into the library's directory -- Use Makefile functionality to simplify recipes - -diff --git a/Makefile b/Makefile -index c2522c775..2e4e44faa 100644 a/Makefile -+++ b/Makefile -@@ -549,6 +549,8 @@ else - endif - $(MAKE) -C tools installopt - -+LIBRARIES = $(addsuffix .$(A), ocamlcommon ocamlbytecomp ocamloptcomp) -+ - .PHONY: installoptopt - installoptopt: - $(INSTALL_PROG) ocamlc.opt$(EXE) "$(INSTALL_BINDIR)" -@@ -585,8 +587,11 @@ endif - ifeq "$(INSTALL_OCAMLNAT)" "true" - $(INSTALL_PROG) ocamlnat$(EXE) "$(INSTALL_BINDIR)" - endif -- cd "$(INSTALL_COMPLIBDIR)" && \ -- $(RANLIB) ocamlcommon.$(A) ocamlbytecomp.$(A) ocamloptcomp.$(A) -+# Some versions of ranlib do not support multiple archives -+ for library in $(LIBRARIES); \ -+ do \ -+$(RANLIB) "$(INSTALL_COMPLIBDIR)/$$library"; \ -+ done - - # Installation of the *.ml sources of compiler-libs - .PHONY: install-compiler-sources -diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common -index 95ff4d58f..6a4451e47 100644 a/otherlibs/Makefile.otherlibs.common -+++ b/otherlibs/Makefile.otherlibs.common -@@ -95,7 +95,7 @@ install:: - fi - ifneq "$(STUBSLIB)" "" - $(INSTALL_DATA) $(STUBSLIB) "$(INSTALL_LIBDIR)/" -- cd "$(INSTALL_LIBDIR)"; $(RANLIB) lib$(CLIBNAME).$(A) -+ $(RANLIB) "$(INSTALL_LIBDIR)/lib$(CLIBNAME).$(A)" - endif - - $(INSTALL_DATA) \ -@@ -104,7 +104,7 @@ endif - ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" - $(INSTALL_DATA) \ - $(CMIFILES:.cmi=.mli) \ -- $(CMIFILES:.cmi=.cmti) \ -+ $(CMIFILES:.cmi=.cmti) \ - "$(INSTALL_LIBDIR)/" - endif - if test -n "$(HEADERS)"; then \ -@@ -115,7 +115,7 @@ installopt: - $(INSTALL_DATA) \ - $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) \ - "$(INSTALL_LIBDIR)/" -- cd "$(INSTALL_LIBDIR)"; $(RANLIB) $(LIBNAME).a -+ $(RANLIB) "$(INSTALL_LIBDIR)/$(LIBNAME).$(A)" - if test -f $(LIBNAME).cmxs; then \ - $(INSTALL_PROG) $(LIBNAME).cmxs "$(INSTALL_LIBDIR)"; \ - fi -diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile -index 6b02dc197..dccc45103 100644 a/otherlibs/dynlink/Makefile -+++ b/otherlibs/dynlink/Makefile -@@ -249,12 +249,12 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" - endif - - installopt: -- if $(NATDYNLINK); then \ --$(INSTALL_DATA) \ -- $(NATOBJS) dynlink.cmxa dynlink.$(A) \ -- "$(INSTALL_LIBDIR)" && \ --cd "$(INSTALL_LIBDIR)" && $(RANLIB) dynlink.$(A); \ -- fi -+ifeq "$(NATDYNLINK)" "true" -+ $(INSTALL_DATA) \ -+$(NATOBJS) dynlink.cmxa dynlink.$(A) \ -+"$(INSTALL_LIBDIR)" -+ $(RANLIB) "$(INSTALL_LIBDIR)/dynlink.$(A)" -+endif - - partialclean: - rm -f $(extract_crc) *.cm[ioaxt] *.cmti *.cmxa \ -diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile -index 8fc1bdb92..379c530fa 100644 a/otherlibs/systhreads/Makefile -+++ b/otherlibs/systhreads/Makefile -@@ -121,7 +121,7 @@ install: - $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \ - fi - $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)" -- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A) -+ $(RANLIB) "$(INSTALL_LIBDIR)/libthreads.$(A)" - mkdir -p "$(INSTALL_THREADSLIBDIR)" - $(INSTALL_DATA) \ - $(CMIFILES) threads.cma \ -@@ -136,11 +136,11 @@ endif - - installopt: - $(INSTALL_DATA) libthreadsnat.$(A) "$(INSTALL_LIBDIR)" -- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreadsnat.$(A) -+ $(RANLIB) "$(INSTALL_LIBDIR)/libthreadsnat.$(A)" - $(INSTALL_DATA) \ - $(THREADS_NCOBJS) threads.cmxa threads.$(A) \ - "$(INSTALL_THREADSLIBDIR)" -- cd "$(INSTALL_THREADSLIBDIR)" && $(RANLIB) threads.$(A) -+ $(RANLIB)
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 378736d2cc6816cb6cbe3ae265966a6a75abced9
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 9 10:45:06 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 9 10:45:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=378736d2
dev-lang/ocaml: VariableOrderWrong
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 4 ++--
dev-lang/ocaml/ocaml-4.12.1.ebuild| 4 ++--
dev-lang/ocaml/ocaml-4.13.1.ebuild| 4 ++--
dev-lang/ocaml/ocaml-4.14.1.ebuild| 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 489cf0a32fef..d57b85a17ce1 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild
b/dev-lang/ocaml/ocaml-4.12.1.ebuild
index 9294aeacdc06..397ff3c8ab8d 100644
--- a/dev-lang/ocaml/ocaml-4.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
diff --git a/dev-lang/ocaml/ocaml-4.13.1.ebuild
b/dev-lang/ocaml/ocaml-4.13.1.ebuild
index 73ab996ee176..385f7be2f182 100644
--- a/dev-lang/ocaml/ocaml-4.13.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.13.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
diff --git a/dev-lang/ocaml/ocaml-4.14.1.ebuild
b/dev-lang/ocaml/ocaml-4.14.1.ebuild
index fe9b42d885eb..5ed03c0a3f13 100644
--- a/dev-lang/ocaml/ocaml-4.14.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit flag-o-matic
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: df402731722626ce346cdeb529b0c37b7a457306
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 9 10:42:47 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 9 10:45:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df402731
dev-lang/ocaml: drop 4.14.0-r1
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/Manifest | 1 -
dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 104 --
2 files changed, 105 deletions(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index b24d4629ee2c..40c13afbea57 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -5,6 +5,5 @@ DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06
SHA512
03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f
SHA512
e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B
f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae
SHA512
da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
-DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B
f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0
SHA512
3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B
6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673
SHA512
6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
DIST ocaml-4.14.2.tar.gz 5505119 BLAKE2B
518c2a69ee32e1c141b574a9800a64efc445381eb2808985b5dbb9d5ec54228aa25042a1c410307c3556488ba12a751980396b0d9a01e60a1ea84ac5b52e6dd6
SHA512
61bfa7961aae02458210f10865a5703f7a50a9be2452379e820cf2dfac2c6037da553c31835145e50a776880bdeb2ec78cd7a3147d65f418e7b3e593534e8a04
diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
deleted file mode 100644
index 83dfc2f12fc2..
--- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-
-HOMEPAGE="https://ocaml.org/;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="emacs flambda latex +ocamlopt xemacs"
-
-RDEPEND="sys-libs/binutils-libs:="
-BDEPEND="${RDEPEND}
- virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
- xemacs? ( app-xemacs/ocaml )"
-
-QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.14.0-clang.patch
-)
-
-src_prepare() {
- default
-
- cp "${FILESDIR}"/ocaml.conf "${T}" || die
-
- # OCaml generates textrels on 32-bit arches
- # We can't do anything about it, but disabling it means that tests
- # for OCaml-based packages won't fail on unexpected output
- # bug #773226
- if use arm || use ppc || use x86 ; then
- append-ldflags "-Wl,-z,notext"
- fi
-
- # Upstream build ignores LDFLAGS in several places.
- sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
- -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
- -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
- Makefile.config.in || die "LDFLAGS fix failed"
-}
-
-src_configure() {
- filter-lto #bug 870349
- local opt=(
- --bindir="${EPREFIX}/usr/bin"
- --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
- --mandir="${EPREFIX}/usr/share/man"
- --prefix="${EPREFIX}/usr"
- $(use_enable flambda)
- )
-
- econf "${opt[@]}"
-}
-
-src_compile() {
- env -u P emake world
-
- if use ocamlopt ; then
- env -u P emake opt
- env -u P emake opt.opt
- fi
-}
-
-src_test() {
- emake -j
-
-
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: b8016276f63ee653979d59a46a1405977ea0fc17
Author: Alfredo Tupone gentoo org>
AuthorDate: Sun Jun 2 08:17:57 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sun Jun 2 08:21:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8016276
dev-lang/ocaml: ignore TEXTRELS
Closes: https://bugs.gentoo.org/924364
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/ocaml-4.14.2.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-lang/ocaml/ocaml-4.14.2.ebuild
b/dev-lang/ocaml/ocaml-4.14.2.ebuild
index f94e0f851126..bb61347421c2 100644
--- a/dev-lang/ocaml/ocaml-4.14.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.2.ebuild
@@ -79,6 +79,10 @@ src_test() {
}
src_install() {
+ # OCaml generates textrels on 32-bit arches
+ if use arm || use ppc || use x86 ; then
+ export QA_TEXTRELS='.*'
+ fi
default
dodir /usr/include
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 0219ee48e71304b5679694259da5f4c1d6d31836
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Apr 29 20:30:02 2024 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Apr 29 20:32:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0219ee48
dev-lang/ocaml: add 4.14.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.14.2.ebuild | 100 +
2 files changed, 101 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 0d030bed824b..b24d4629ee2c 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -7,3 +7,4 @@ DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe8445959
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B
f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae
SHA512
da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B
f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0
SHA512
3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B
6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673
SHA512
6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
+DIST ocaml-4.14.2.tar.gz 5505119 BLAKE2B
518c2a69ee32e1c141b574a9800a64efc445381eb2808985b5dbb9d5ec54228aa25042a1c410307c3556488ba12a751980396b0d9a01e60a1ea84ac5b52e6dd6
SHA512
61bfa7961aae02458210f10865a5703f7a50a9be2452379e820cf2dfac2c6037da553c31835145e50a776880bdeb2ec78cd7a3147d65f418e7b3e593534e8a04
diff --git a/dev-lang/ocaml/ocaml-4.14.2.ebuild
b/dev-lang/ocaml/ocaml-4.14.2.ebuild
new file mode 100644
index ..f94e0f851126
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.14.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv
~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="emacs flambda latex +ocamlopt xemacs"
+
+RDEPEND="sys-libs/binutils-libs:="
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ filter-lto #bug 870349
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ )
+
+ econf "${opt[@]}"
+}
+
+src_compile() {
+ env -u P emake world
+
+ if use ocamlopt ; then
+ env -u P emake opt
+ env -u P emake opt.opt
+ fi
+}
+
+src_test() {
+ emake -j
+
+ # OCaml tests only work when run sequentially
+ if use ocamlopt ; then
+ emake -j1 ocamltest.opt
+ else
+ emake -j1 ocamltest
+ #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+
+ emake -j1 tests
+}
+
+src_install() {
+ default
+
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+ dodoc Changes README.adoc
+
+ # Create envd entry for latex input files
+ if use latex ; then
+ echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" >
"${T}"/99ocamldoc || die
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/
commit: afa9c354085529b2b8f88418645a3b34fe5f4bcc Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Nov 7 18:02:45 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Wed Nov 15 17:26:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa9c354 dev-lang/ocaml: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/33710 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch | 13 - 1 file changed, 13 deletions(-) diff --git a/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch b/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch deleted file mode 100644 index ceeb82991098.. --- a/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://bugs.gentoo.org/459512 - ocaml-4.04.2/configure -+++ ocaml-4.04.2/configure -@@ -1095,7 +1095,7 @@ - # For the terminfo module - - if test "$with_curses" = "yes"; then -- for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do -+ for libs in "" "-ltinfo" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do - if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then - inf "termcap functions found (with libraries '$libs')" - echo "#define HAS_TERMCAP" >> s.h
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: da16ce0bc073186b149ff9cd6c6e8b724c88fd59
Author: John Helmert III gentoo org>
AuthorDate: Sun Oct 22 23:00:32 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 28 00:24:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da16ce0b
dev-lang/ocaml: drop 4.05.0-r9
Bug: https://bugs.gentoo.org/719134
Signed-off-by: John Helmert III gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/28090
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest | 3 -
dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 156 --
2 files changed, 159 deletions(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 330bb3062ab5..0d030bed824b 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-4.05.0-patches-1.tar.bz2 4009 BLAKE2B
052c3a6859a942f2993d0b06ab57ca8f7469650c096f20bff7ff7cf5c2842e8d5019d595a4eca0dc1a4e5feda2db8a831a6917b3b6d9f39166c8ae7af1e894e7
SHA512
b349e6613201d9400f736c5b2d0ede01e7e113524cbc698a71fb97cb1eb67f90af8c2fbd3fd8abeccf3193e317cdd8258aee328c3e078634385c21558619
-DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B
c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc
SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
DIST ocaml-4.09.0-patches-1.tar.bz2 3300 BLAKE2B
ef710ea5ed5a243ae684f68b7f203ba454192c9f8f19c32697d336bf18cf2a0e8ea08df232b0fd8e2475a000758a5ba95b3794096ec7d0d1b292a715ab3de86f
SHA512
94096b99fd58b32232e418c5736203f08ab3c1558154ed00d4290730bd4db849bc60dfae6160f344acce63bbb8eaceecee25cf836bb73fa419d7bbf4eac433f1
DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd
SHA512
dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
DIST ocaml-4.10.2-patches-1.tar.bz2 3180 BLAKE2B
474471e10c4525e4da730fcf8602fddf5209f7d8eb15bd76894ed2bc22213a6e61aa7f52b1b67dff6c8bf04eac7d759ada28f1783c83a075cc65e7e5caadc715
SHA512
1456f90c0c833461eb9d1c140ba1a7358aa9351f6303e83b0e19bb8688dcb17bdad211f4cec1281a47180bbdddcfdbf44367b47a6b301d2ea41fa9d926bd03a5
@@ -9,4 +7,3 @@ DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe8445959
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B
f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae
SHA512
da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B
f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0
SHA512
3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B
6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673
SHA512
6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
-DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
deleted file mode 100644
index 4094da061f17..
--- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-PATCHLEVEL="9"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="https://ocaml.org;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2
-
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-patches-1.tar.bz2;
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
-# so here we go with the subslot.
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos"
-IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
-
-RDEPEND="
- sys-libs/binutils-libs:=
- ncurses? ( sys-libs/ncurses:0= )
- spacetime? ( sys-libs/libunwind:= )
-
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 93ded4dce728e2aab3f58209fd4f0dcb1dfd34ab
Author: Leonardo Hernández Hernández proton me>
AuthorDate: Sat Jun 24 02:47:02 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 24 02:58:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ded4dc
dev-lang/ocaml: replace `filter-flags -flto*` with `filter-lto`
Signed-off-by: Leonardo Hernández Hernández proton.me>
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 4 ++--
dev-lang/ocaml/ocaml-4.10.2-r3.ebuild | 4 ++--
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
index dd5765530bc6..4094da061f17 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
@@ -71,7 +71,7 @@ src_configure() {
# Broken until 4.12
# bug #818445
- filter-flags '-flto*'
+ filter-lto
append-flags -fno-strict-aliasing
# -ggdb3 & co makes it behave weirdly, breaks sexplib
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index d2775d25bc47..e77d3241e08f 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -35,7 +35,7 @@ src_prepare() {
# Broken until 4.12
# bug #818445
- filter-flags '-flto*'
+ filter-lto
append-flags -fno-strict-aliasing
# OCaml generates textrels on 32-bit arches
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
index a74d2787fd7c..2f80ff02a1ee 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -35,7 +35,7 @@ src_prepare() {
# Broken until 4.12
# bug #818445
- filter-flags '-flto*'
+ filter-lto
append-flags -fno-strict-aliasing
# OCaml generates textrels on 32-bit arches
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 38489cf772f3..489cf0a32fef 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -35,7 +35,7 @@ src_prepare() {
# Broken until 4.12
# bug #818445
- filter-flags '-flto*'
+ filter-lto
append-flags -fno-strict-aliasing
# OCaml generates textrels on 32-bit arches
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: c0b9f984c27b26bdfe719ae1158ae944d0c8807d Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 3 19:09:29 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 3 19:09:29 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b9f984 dev-lang/ocaml: Stabilize 4.05.0-r9 arm64, #901711 Signed-off-by: Arthur Zamarin gentoo.org> dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild index caa25a4b6e68..f793a8387363 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: d0f5af7afc8c6d2bd8f11877754a4b8eeb190caf Author: Arthur Zamarin gentoo org> AuthorDate: Mon Apr 3 19:09:26 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Apr 3 19:09:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0f5af7a dev-lang/ocaml: Stabilize 4.05.0-r9 arm, #901711 Signed-off-by: Arthur Zamarin gentoo.org> dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild index e6811e268de7..caa25a4b6e68 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 7dbaaa269143ca5d1a4fee505d2f9c704830e26e
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Mar 17 11:41:24 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 17 11:41:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dbaaa26
dev-lang/ocaml: Stabilize 4.14.1 ppc64, #901615
Signed-off-by: Arthur Zamarin gentoo.org>
dev-lang/ocaml/ocaml-4.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.14.1.ebuild
b/dev-lang/ocaml/ocaml-4.14.1.ebuild
index e57bd96523e6..439749671ad0 100644
--- a/dev-lang/ocaml/ocaml-4.14.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc
x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 45ec1f3f32771ee3cee86dc0ca107faae8d89b41 Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 17 11:26:48 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 17 11:26:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ec1f3f dev-lang/ocaml: Stabilize 4.05.0-r9 ppc64, #901711 Signed-off-by: Arthur Zamarin gentoo.org> dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild index e43f9405e0e1..e6811e268de7 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 2466cf9a30c79f5d70e0f7375bc7cdc709669c0c Author: Arthur Zamarin gentoo org> AuthorDate: Fri Mar 17 08:52:06 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Fri Mar 17 08:52:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2466cf9a dev-lang/ocaml: Stabilize 4.14.0-r1 ppc64, #901673 Signed-off-by: Arthur Zamarin gentoo.org> dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild index d094b2b5991f..d136814d9ade 100644 --- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt xemacs" RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: fd8d0cbf01ebbf727d69a6cf6094ed94055c2b62 Author: Sam James gentoo org> AuthorDate: Fri Mar 17 03:21:28 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 03:21:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd8d0cbf dev-lang/ocaml: Stabilize 4.05.0-r9 x86, #901711 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild index ee12dc760a5d..e43f9405e0e1 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 61c4cb92838ba6d649e953bcaf7230cf31aeaed5 Author: Sam James gentoo org> AuthorDate: Fri Mar 17 02:28:11 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 02:28:11 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c4cb92 dev-lang/ocaml: Stabilize 4.05.0-r9 amd64, #901711 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild index 00764d5fcf07..ee12dc760a5d 100644 --- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild +++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2" # Everytime ocaml is updated to a new version, everything ocaml must be rebuilt, # so here we go with the subslot. SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 2cc541391a518d8f1bee121c3b66b469797fa484 Author: Sam James gentoo org> AuthorDate: Fri Mar 17 02:27:36 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 02:27:36 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc54139 dev-lang/ocaml: Stabilize 4.14.0-r1 x86, #901673 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild index 2ce52efdb648..d094b2b5991f 100644 --- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt xemacs" RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: f484cf766707501eb706dc617d32414ddd00c2b8 Author: Sam James gentoo org> AuthorDate: Fri Mar 17 02:27:34 2023 + Commit: Sam James gentoo org> CommitDate: Fri Mar 17 02:27:34 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f484cf76 dev-lang/ocaml: Stabilize 4.14.0-r1 amd64, #901673 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild index be5c47bf9d90..2ce52efdb648 100644 --- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt xemacs" RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: dc6ac9d6df1d3f7e49988c867fbb5131330e24ba
Author: Sam James gentoo org>
AuthorDate: Thu Mar 16 23:20:36 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 16 23:20:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc6ac9d6
dev-lang/ocaml: Stabilize 4.14.1 arm, #901615
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/ocaml-4.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.14.1.ebuild
b/dev-lang/ocaml/ocaml-4.14.1.ebuild
index e585e81b8d45..37a90dfbb941 100644
--- a/dev-lang/ocaml/ocaml-4.14.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc
~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 9d020b77f0c3664c6dc862619e49fa082df27b3a Author: Sam James gentoo org> AuthorDate: Thu Mar 16 23:15:10 2023 + Commit: Sam James gentoo org> CommitDate: Thu Mar 16 23:15:10 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d020b77 dev-lang/ocaml: Stabilize 4.14.0-r1 arm64, #901673 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild index 9d2a473ee6c2..be5c47bf9d90 100644 --- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt xemacs" RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 551a821221fec4be09f32e0518bbca7571c75544 Author: Sam James gentoo org> AuthorDate: Thu Mar 16 23:15:08 2023 + Commit: Sam James gentoo org> CommitDate: Thu Mar 16 23:15:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551a8212 dev-lang/ocaml: Stabilize 4.14.0-r1 arm, #901673 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild index 6f2795bf607a..9d2a473ee6c2 100644 --- a/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild +++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt xemacs" RDEPEND="sys-libs/binutils-libs:="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 46bc3d9513f79458df0669e871106436fee43806
Author: Matt Turner gentoo org>
AuthorDate: Wed Feb 15 18:27:50 2023 +
Commit: Matt Turner gentoo org>
CommitDate: Wed Feb 15 18:36:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46bc3d95
dev-lang/ocaml: Drop alpha keywords
Signed-off-by: Matt Turner gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.10.2-r3.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.12.1.ebuild| 2 +-
dev-lang/ocaml/ocaml-4.13.1.ebuild| 2 +-
dev-lang/ocaml/ocaml-4.14.0-r1.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.14.1.ebuild| 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
index 836f967b59ce..00764d5fcf07 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r9.ebuild
@@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
RDEPEND="
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index 7a37a7cf0528..3a8fcc9b404e 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
index b0b37115a35c..6ad3683f4682 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 95b42d8a1a61..a7208b511bee 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild
b/dev-lang/ocaml/ocaml-4.12.1.ebuild
index 70049fcc0ae4..a3c62596b9b0 100644
--- a/dev-lang/ocaml/ocaml-4.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt xemacs"
RDEPEND="sys-libs/binutils-libs:="
diff --git a/dev-lang/ocaml/ocaml-4.13.1.ebuild
b/dev-lang/ocaml/ocaml-4.13.1.ebuild
index 979584167046..000e2de371cb 100644
--- a/dev-lang/ocaml/ocaml-4.13.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.13.1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="QPL-1.0 LGPL-2"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 4c5ad634e096030701e68b385425b67982a679ca
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Feb 10 19:10:42 2023 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Feb 10 19:11:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c5ad634
dev-lang/ocaml: add 4.14.1
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.14.1.ebuild | 100 +
2 files changed, 101 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index edc6337be4cb..330bb3062ab5 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -8,4 +8,5 @@ DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f
SHA512
e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B
f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae
SHA512
da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B
f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0
SHA512
3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32
+DIST ocaml-4.14.1.tar.gz 5498436 BLAKE2B
6113283ab0f7ac39ade1f35a02c203a6956f8f4efa4f174daf53483c1d874613195c2705ca02760f0ff4abd9b37c91f8dec59c010ac8ae8731790cdd6f429673
SHA512
6340e145c7d11a1ee9fa1699fc6a8a6785f14ff9c05dca708cf278194642ec9b7c562d744d8b38e5dab74b88fa3a5760035e214f5f8fab8b233a344b035db8fb
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.14.1.ebuild
b/dev-lang/ocaml/ocaml-4.14.1.ebuild
new file mode 100644
index ..555de3ad282e
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.14.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64
~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt xemacs"
+
+RDEPEND="sys-libs/binutils-libs:="
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ filter-lto #bug 870349
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ )
+
+ econf "${opt[@]}"
+}
+
+src_compile() {
+ env -u P emake world
+
+ if use ocamlopt ; then
+ env -u P emake opt
+ env -u P emake opt.opt
+ fi
+}
+
+src_test() {
+ emake -j
+
+ # OCaml tests only work when run sequentially
+ if use ocamlopt ; then
+ emake -j1 ocamltest.opt
+ else
+ emake -j1 ocamltest
+ #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+
+ emake -j1 tests
+}
+
+src_install() {
+ default
+
+ dodir
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: f4c0389745bf470502ddefc8065d50e6a9033260
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Sep 29 07:00:02 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Sep 29 07:00:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4c03897
dev-lang/ocaml: filtering lto
Closes: https://bugs.gentoo.org/872995
Closes: https://bugs.gentoo.org/870349
Closes: https://bugs.gentoo.org/835157
Closes: https://bugs.gentoo.org/858446
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/{ocaml-4.14.0.ebuild => ocaml-4.14.0-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-lang/ocaml/ocaml-4.14.0.ebuild
b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.14.0.ebuild
rename to dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
index b68dee9dfbaa..6c564eb4fcae 100644
--- a/dev-lang/ocaml/ocaml-4.14.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.14.0-r1.ebuild
@@ -47,6 +47,7 @@ src_prepare() {
}
src_configure() {
+ filter-lto #bug 870349
local opt=(
--bindir="${EPREFIX}/usr/bin"
--libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: 06b36e0f648bef1acf5ad451d9eebe3e04df2120 Author: Mark Wright gentoo org> AuthorDate: Tue Mar 29 12:08:33 2022 + Commit: Mark Wright gentoo org> CommitDate: Tue Mar 29 12:08:33 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06b36e0f dev-lang/ocaml: Bump to 4.14.0, fix clang build. See: https://github.com/ocaml/ocaml/pull/10774 Closes: https://bugs.gentoo.org/729566 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Mark Wright gentoo.org> dev-lang/ocaml/Manifest | 1 + dev-lang/ocaml/files/ocaml-4.14.0-clang.patch | 132 ++ dev-lang/ocaml/ocaml-4.14.0.ebuild| 103 3 files changed, 236 insertions(+) diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index 9466e909f6b9..edc6337be4cb 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -7,4 +7,5 @@ DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603 DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3 DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f SHA512 e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671 DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae SHA512 da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6 +DIST ocaml-4.14.0.tar.gz 5494844 BLAKE2B f2f9142a95722c7fc5fda205ea6b951939f7d285963b8aa14dc157ac10202ef9d00c7590beabdc97ed83548d61e5ef28b60a360f1a492420a54f4e26dfbf89f0 SHA512 3c5e5b9f00bb109dd99b5f7b0078cf8663d4247e548f3e601d6b2a55582e04bb20f6de85005c4cf2f78ae9aaa449f5ca6f2bab2f6ce83eeb3aeb386e3f2fcc32 DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B 4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 diff --git a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch b/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch new file mode 100644 index ..cd3c042f2639 --- /dev/null +++ b/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch @@ -0,0 +1,132 @@ +commit 28b553622bd0f168411d86ddcfba1adab0d87b92 +Author: Yawar Amin +Date: Mon Nov 15 22:40:43 2021 -0500 + +Fix ranlib error + +- Always pass ranlib one file argument at a time to avoid error 'Exactly + one archive should be specified' +- Call ranlib without cd'ing into the library's directory +- Use Makefile functionality to simplify recipes + +diff --git a/Makefile b/Makefile +index c2522c775..2e4e44faa 100644 +--- a/Makefile b/Makefile +@@ -549,6 +549,8 @@ else + endif + $(MAKE) -C tools installopt + ++LIBRARIES = $(addsuffix .$(A), ocamlcommon ocamlbytecomp ocamloptcomp) ++ + .PHONY: installoptopt + installoptopt: + $(INSTALL_PROG) ocamlc.opt$(EXE) "$(INSTALL_BINDIR)" +@@ -585,8 +587,11 @@ endif + ifeq "$(INSTALL_OCAMLNAT)" "true" + $(INSTALL_PROG) ocamlnat$(EXE) "$(INSTALL_BINDIR)" + endif +- cd "$(INSTALL_COMPLIBDIR)" && \ +- $(RANLIB) ocamlcommon.$(A) ocamlbytecomp.$(A) ocamloptcomp.$(A) ++# Some versions of ranlib do not support multiple archives ++ for library in $(LIBRARIES); \ ++ do \ ++$(RANLIB) "$(INSTALL_COMPLIBDIR)/$$library"; \ ++ done + + # Installation of the *.ml sources of compiler-libs + .PHONY: install-compiler-sources +diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common +index 95ff4d58f..6a4451e47 100644 +--- a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common +@@ -95,7 +95,7 @@ install:: + fi + ifneq "$(STUBSLIB)" "" + $(INSTALL_DATA) $(STUBSLIB) "$(INSTALL_LIBDIR)/" +- cd "$(INSTALL_LIBDIR)"; $(RANLIB) lib$(CLIBNAME).$(A) ++ $(RANLIB) "$(INSTALL_LIBDIR)/lib$(CLIBNAME).$(A)" + endif + + $(INSTALL_DATA) \ +@@ -104,7 +104,7 @@ endif + ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" + $(INSTALL_DATA) \ + $(CMIFILES:.cmi=.mli) \ +- $(CMIFILES:.cmi=.cmti) \ ++ $(CMIFILES:.cmi=.cmti) \ + "$(INSTALL_LIBDIR)/" + endif + if test -n "$(HEADERS)"; then \ +@@ -115,7 +115,7 @@ installopt: + $(INSTALL_DATA) \ + $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) \ +
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: 1eabb8b88db7647b7a04300ead166f4e4e852951
Author: Sam James gentoo org>
AuthorDate: Fri Mar 4 00:55:27 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 4 00:56:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eabb8b8
dev-lang/ocaml: drop 4.09.0-r2
Bug: https://bugs.gentoo.org/804498
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 65
dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch | 21 -
dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 104 -
3 files changed, 190 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
deleted file mode 100644
index d0a947da0ea6..
--- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
+++ /dev/null
@@ -1,65 +0,0 @@
a/runtime/Makefile
-+++ b/runtime/Makefile
-@@ -335,7 +335,7 @@
- # (without the extension, which is added by the macro)
- define COMPILE_C_FILE
- $(1).$(O): %.c
-- $$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
-+ $$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
- endef
-
- object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
a/yacc/Makefile
-+++ b/yacc/Makefile
-@@ -63,4 +63,4 @@
- # also works for .obj files.
-
- %.$(O): %.c
-- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
-+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
a/otherlibs/Makefile.otherlibs.common
-+++ b/otherlibs/Makefile.otherlibs.common
-@@ -138,4 +138,4 @@
- $(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
-
- .c.$(O):
-- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
-+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
a/ocamltest/Makefile
-+++ b/ocamltest/Makefile
-@@ -221,7 +221,7 @@
- $(ocamllex) -q $<
-
- %.$(O): %.c
-- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -c $<
-+ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -c $<
-
- ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config
- sed \
a/otherlibs/systhreads/Makefile
-+++ b/otherlibs/systhreads/Makefile
-@@ -93,11 +93,11 @@
- # twice, each time with different options).
-
- st_stubs_b.$(O): st_stubs.c $(HEADER)
-- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \
-+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \
- $(SHAREDLIB_CFLAGS) $(OUTPUTOBJ)$@ $<
-
- st_stubs_n.$(O): st_stubs.c $(HEADER)
-- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) \
-+ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) \
- -I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \
- -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \
- $(OUTPUTOBJ)$@ -c $<
a/tools/Makefile
-+++ b/tools/Makefile
-@@ -322,7 +322,7 @@
- endif
-
- objinfo_helper$(EXE): objinfo_helper.c $(ROOTDIR)/runtime/caml/s.h
-- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime $(OUTPUTEXE)$@ \
-+ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime
$(OUTPUTEXE)$@ \
- $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) $< $(LIBBFD_LINK)
-
- OBJINFO=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch
b/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch
deleted file mode 100644
index e25d55a5f668..
--- a/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
a/runtime/backtrace.c
-+++ b/runtime/backtrace.c
-@@ -28,7 +28,7 @@
- #include "caml/fail.h"
-
- /* The table of debug information fragments */
--struct ext_table caml_debug_info;
-+extern struct ext_table caml_debug_info;
-
- CAMLexport int32_t caml_backtrace_active = 0;
- CAMLexport int32_t caml_backtrace_pos = 0;
a/runtime/startup_nat.c
-+++ b/runtime/startup_nat.c
-@@ -44,7 +44,6 @@
- #endif
-
- extern int caml_parser_trace;
--CAMLexport header_t caml_atom_table[256];
- char * caml_code_area_start, * caml_code_area_end;
- struct ext_table caml_code_fragments_table;
-
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
deleted file mode 100644
index f889bc03a12a..
--- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-HOMEPAGE="https://ocaml.org/;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
-
-LICENSE="LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
-
-RDEPEND="sys-libs/binutils-libs:=
- spacetime? (
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: b80cad3833f175c1d9dd411a0789cd202bb622cf
Author: Alfredo Tupone gentoo org>
AuthorDate: Mon Feb 28 19:31:14 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Mon Feb 28 19:31:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b80cad38
dev-lang/ocaml: add riscv patch to 4.13.1 too
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/ocaml-4.13.1.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/dev-lang/ocaml/ocaml-4.13.1.ebuild
b/dev-lang/ocaml/ocaml-4.13.1.ebuild
index 1765de6905c0..979584167046 100644
--- a/dev-lang/ocaml/ocaml-4.13.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.13.1.ebuild
@@ -22,6 +22,10 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.1-fix-textrel-riscv.patch
+)
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: ce977bc4017bca5ff74a122fd4555e03a6703354
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Feb 27 08:57:33 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Feb 27 08:57:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce977bc4
dev-lang/ocaml: x86 stable wrt bug #804498
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index 0bc8a02001cd..7a37a7cf0528 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 52cbaf4c145b1bf7a9a317f78c56c7ccd710ffa6
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Feb 27 08:56:04 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Feb 27 08:56:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52cbaf4c
dev-lang/ocaml: amd64 stable wrt bug #804498
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index 9c188a94a0a2..0bc8a02001cd 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: 687393e4bd5f9a0f9bf4a2f766ea1246f7b324f7
Author: Sam James gentoo org>
AuthorDate: Sun Feb 27 06:25:12 2022 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 27 06:26:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=687393e4
dev-lang/ocaml: fix 4.11.2 src_prepare (missing patch)
Accidentally cleaned up in 9e8369277b272b15f3dd1159fa18b71ec4431a77 (got
confused by what I had/hadn't moved into patch tarballs, renamed accordingly
now to avoid that in future).
Once OCaml 4.09.0-r3 stabilisation is complete, we can cleanup all
the obsolete patches from files/ and then everything is a bit clearer.
Bug: https://bugs.gentoo.org/804498
Fixes: 9e8369277b272b15f3dd1159fa18b71ec4431a77
See: https://forums.gentoo.org/viewtopic-t-1147490.html
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch | 42 ++
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch
b/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch
new file mode 100644
index ..7adb1ea0768d
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.11.2-cflags.patch
@@ -0,0 +1,42 @@
+--- a/runtime/Makefile
b/runtime/Makefile
+@@ -335,7 +335,7 @@
+ # (without the extension, which is added by the macro)
+ define COMPILE_C_FILE
+ $(1).$(O): %.c
+- $$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
++ $$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
+ endef
+
+ object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
+--- a/otherlibs/Makefile.otherlibs.common
b/otherlibs/Makefile.otherlibs.common
+@@ -138,4 +138,4 @@
+ $(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
+
+ .c.$(O):
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+--- a/otherlibs/systhreads/Makefile
b/otherlibs/systhreads/Makefile
+@@ -102,10 +102,10 @@
+ st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS)
+
+ st_stubs_b.$(O): st_stubs.c $(HEADER)
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+
+ st_stubs_n.$(O): st_stubs.c $(HEADER)
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+
+ partialclean:
+ rm -f *.cm*
+--- a/Makefile.common.in
b/Makefile.common.in
+@@ -79,4 +79,4 @@
+ # general (it supports both .o and .obj)
+
+ %.$(O): %.c
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 666f43b938bd..00f3ebf026fd 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -25,7 +25,7 @@ QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
PATCHES=(
"${FILESDIR}"/${PN}-4.11.2-glibc-2.34.patch
- "${FILESDIR}"/${PN}-4.10.2-cflags.patch
+ "${FILESDIR}"/${PN}-4.11.2-cflags.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: ef079a3f3fc3713d117c799de7068415f500e562
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 26 12:33:34 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 26 12:33:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef079a3f
dev-lang/ocaml: Stabilize 4.09.0-r3 ppc64, #804498
Signed-off-by: Arthur Zamarin gentoo.org>
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index 28598a9f2bd9..9c188a94a0a2 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: a2f5876317f424bcc87baa66b8e689dcb6583c26
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 26 12:08:07 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 26 12:08:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2f58763
dev-lang/ocaml: Stabilize 4.09.0-r3 arm, #804498
Signed-off-by: Arthur Zamarin gentoo.org>
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index 6cc1555736f6..28598a9f2bd9 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 125576b15128276382cccf29341b18f3ffc91ee3
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Feb 26 11:53:21 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Feb 26 11:53:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=125576b1
dev-lang/ocaml: Stabilize 4.09.0-r3 arm64, #804498
Signed-off-by: Arthur Zamarin gentoo.org>
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
index 7d1b5b6f6592..6cc1555736f6 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz
LICENSE="LGPL-2.1"
SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: 85fb0c39c57aae6d7795b6ee1259d53ecfebd882
Author: Alfredo Tupone gentoo org>
AuthorDate: Fri Feb 25 19:58:12 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Fri Feb 25 19:58:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85fb0c39
dev-lang/ocaml: fix TEXTREL on 4.12.1
Closes: https://bugs.gentoo.org/825282
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
.../files/ocaml-4.12.1-fix-textrel-riscv.patch | 46 ++
dev-lang/ocaml/ocaml-4.12.1.ebuild | 1 +
2 files changed, 47 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.12.1-fix-textrel-riscv.patch
b/dev-lang/ocaml/files/ocaml-4.12.1-fix-textrel-riscv.patch
new file mode 100644
index ..5ba8582d3a65
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.12.1-fix-textrel-riscv.patch
@@ -0,0 +1,46 @@
+From ddf99786f8229c8282905af5c7c74360d4f2fbd0 Mon Sep 17 00:00:00 2001
+From: Alex Fan
+Date: Tue, 22 Feb 2022 19:28:30 +1100
+Subject: [PATCH] riscv: Generate frametable in data section to improve code
+ relocatability (#11042)
+
+Similar to what PowerPC and System-Z have done in commit
24980d3fd9848e281761ef2b8fe383e71261789b
+
+With this commit ocamlopt produces .so shared libraries and PIE relocatable
+executables that contain no relocations in the text segment.
+
+Upstream status: merged in 4.14 and 5.x
+---
+ Changes| 5 +
+ asmcomp/riscv/emit.mlp | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/Changes b/Changes
+index 4898e9d69fc..2bec76daac6 100644
+--- a/Changes
b/Changes
+@@ -477,6 +477,11 @@ OCaml 4.14.0
+ - #10907, #10959: Wrong type inferred from existential types
+ (Jacques Garrigue and Gabriel Scherer, report by @dyzsr, review by Leo
White)
+
++- #10688: Move frame descriptor table from `rodata` to `data` section on
++ RISC-V. Improves support for building DLLs and PIEs. In particular, this
++ applies to all binaries in distributions that build PIEs by default (eg
++ Gentoo and Alpine).
++ (Alex Fan, review by Gabriel Scherer)
+
+ OCaml 4.13 maintenance branch
+ -
+diff --git a/asmcomp/riscv/emit.mlp b/asmcomp/riscv/emit.mlp
+index 474a3c6857a..b36aa0ea38c 100644
+--- a/asmcomp/riscv/emit.mlp
b/asmcomp/riscv/emit.mlp
+@@ -645,7 +645,7 @@ let end_assembly() =
+ `{emit_symbol lbl_end}:\n`;
+ ` .quad 0\n`;
+ (* Emit the frame descriptors *)
+- ` {emit_string rodata_space}\n`;
++ ` {emit_string data_space}\n`; (* not rodata because relocations inside *)
+ let lbl = Compilenv.make_symbol (Some "frametable") in
+ declare_global_data lbl;
+ `{emit_symbol lbl}:\n`;
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild
b/dev-lang/ocaml/ocaml-4.12.1.ebuild
index fd6cae2fff2c..70049fcc0ae4 100644
--- a/dev-lang/ocaml/ocaml-4.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -24,6 +24,7 @@ QA_FLAGS_IGNORED='/usr/lib.*/ocaml/bigarray.cmxs'
PATCHES=(
"${FILESDIR}"/${PN}-4.12.0-glibc-2.34.patch
+ "${FILESDIR}"/${P}-fix-textrel-riscv.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: 9e8369277b272b15f3dd1159fa18b71ec4431a77
Author: Sam James gentoo org>
AuthorDate: Tue Feb 22 00:58:44 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 22 00:58:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e836927
dev-lang/ocaml: drop 4.05.0-r7, 4.05.0-r8, 4.10.2-r2
Signed-off-by: Sam James gentoo.org>
.../ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch | 70 -
dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch | 59
dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch | 42 --
dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 155
dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 156 -
dev-lang/ocaml/ocaml-4.10.2-r2.ebuild | 105 --
6 files changed, 587 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
b/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
deleted file mode 100644
index cfe3ff636c25..
--- a/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-https://bugs.gentoo.org/755257
-
-Needed for both fixing the CVE + compatibility with Debian for e.g.
-Unison.
-
-From c6ca3afc78b75d7748e4e09e56c6b020418be06e Mon Sep 17 00:00:00 2001
-From: Stephane Glondu
-Date: Fri, 25 Jan 2019 14:34:23 +0100
-Subject: [PATCH] Fix integer overflows when unmarshaling a bigarray
-
-Malicious or corrupted marshaled data can result in a bigarray
-with impossibly large dimensions that cause overflow when computing
-the in-memory size of the bigarray. Disaster ensues when the data
-is read in a too small memory area. This commit checks for overflows
-when computing the in-memory size of the bigarray.
-
-This patch is based on one by Xavier Leroy and has been modified to
-use caml_ba_multov instead of caml_umul_overflow which is unavailable
-in OCaml 4.05.0.
-
-The original commit hash is 85162eee9d4072fa9c2f498f03cd94e357033eec.
-
-Origin: https://github.com/ocaml/ocaml/pull/1718
-Bug: https://github.com/ocaml/ocaml/issues/7765
-Bug-Debian: https://bugs.debian.org/895472
-Bug-CVE: CVE-2018-9838
a/otherlibs/bigarray/bigarray_stubs.c
-+++ b/otherlibs/bigarray/bigarray_stubs.c
-@@ -966,22 +966,34 @@ static void caml_ba_deserialize_longarray(void * dest,
intnat num_elts)
- uintnat caml_ba_deserialize(void * dst)
- {
- struct caml_ba_array * b = dst;
-- int i, elt_size;
-- uintnat num_elts;
-+ int i;
-+ uintnat num_elts, size;
-+ int overflow;
-
- /* Read back header information */
- b->num_dims = caml_deserialize_uint_4();
-+ if (b->num_dims < 0 || b->num_dims > CAML_BA_MAX_NUM_DIMS)
-+caml_deserialize_error("input_value: wrong number of bigarray
dimensions");
- b->flags = caml_deserialize_uint_4() | CAML_BA_MANAGED;
- b->proxy = NULL;
- for (i = 0; i < b->num_dims; i++) b->dim[i] = caml_deserialize_uint_4();
-- /* Compute total number of elements */
-- num_elts = caml_ba_num_elts(b);
-- /* Determine element size in bytes */
-+ /* Compute total number of elements. Watch out for overflows (MPR#7765). */
-+ num_elts = 1;
-+ for (i = 0; i < b->num_dims; i++) {
-+overflow = 0;
-+num_elts = caml_ba_multov(num_elts, b->dim[i], );
-+if (overflow)
-+ caml_deserialize_error("input_value: size overflow for bigarray");
-+ }
-+ /* Determine array size in bytes. Watch out for overflows (MPR#7765). */
- if ((b->flags & CAML_BA_KIND_MASK) > CAML_BA_CHAR)
- caml_deserialize_error("input_value: bad bigarray kind");
-- elt_size = caml_ba_element_size[b->flags & CAML_BA_KIND_MASK];
-+ overflow = 0;
-+ size = caml_ba_multov(num_elts, caml_ba_element_size[b->flags &
CAML_BA_KIND_MASK], );
-+ if (overflow)
-+caml_deserialize_error("input_value: size overflow for bigarray");
- /* Allocate room for data */
-- b->data = malloc(elt_size * num_elts);
-+ b->data = malloc(size);
- if (b->data == NULL)
- caml_deserialize_error("input_value: out of memory for bigarray");
- /* Read data */
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
deleted file mode 100644
index 8b2e99883167..
--- a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
+++ /dev/null
@@ -1,59 +0,0 @@
a/byterun/caml/intext.h
-+++ b/byterun/caml/intext.h
-@@ -196,7 +196,7 @@
-
- CAMLextern struct code_fragment * caml_extern_find_code(char *addr);
-
--struct ext_table caml_code_fragments_table;
-+extern struct ext_table caml_code_fragments_table;
-
- #endif /* CAML_INTERNALS */
-
a/byterun/caml/major_gc.h
-+++ b/byterun/caml/major_gc.h
-@@ -64,9 +64,9 @@
- extern char *caml_gc_sweep_hp;
-
- extern int caml_major_window;
--double caml_major_ring[Max_major_window];
--int caml_major_ring_index;
--double caml_major_work_credit;
-+extern double caml_major_ring[Max_major_window];
-+extern int caml_major_ring_index;
-+extern double caml_major_work_credit;
- extern double caml_gc_clock;
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: baf24b7ec12927d0ac7e2b853cccec4e28fe Author: Sam James gentoo org> AuthorDate: Tue Feb 22 00:55:02 2022 + Commit: Sam James gentoo org> CommitDate: Tue Feb 22 00:55:41 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf2 dev-lang/ocaml: use tarball for 4.05/4.09/4.10 patches Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/Manifest| 3 + dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch | 186 dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch | 178 --- dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch | 239 - dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 7 +- dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 12 +- dev-lang/ocaml/ocaml-4.10.2-r3.ebuild | 11 +- 7 files changed, 18 insertions(+), 618 deletions(-) diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index eda27fba03db..9466e909f6b9 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -1,5 +1,8 @@ +DIST ocaml-4.05.0-patches-1.tar.bz2 4009 BLAKE2B 052c3a6859a942f2993d0b06ab57ca8f7469650c096f20bff7ff7cf5c2842e8d5019d595a4eca0dc1a4e5feda2db8a831a6917b3b6d9f39166c8ae7af1e894e7 SHA512 b349e6613201d9400f736c5b2d0ede01e7e113524cbc698a71fb97cb1eb67f90af8c2fbd3fd8abeccf3193e317cdd8258aee328c3e078634385c21558619 DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225 +DIST ocaml-4.09.0-patches-1.tar.bz2 3300 BLAKE2B ef710ea5ed5a243ae684f68b7f203ba454192c9f8f19c32697d336bf18cf2a0e8ea08df232b0fd8e2475a000758a5ba95b3794096ec7d0d1b292a715ab3de86f SHA512 94096b99fd58b32232e418c5736203f08ab3c1558154ed00d4290730bd4db849bc60dfae6160f344acce63bbb8eaceecee25cf836bb73fa419d7bbf4eac433f1 DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B 80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd SHA512 dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae +DIST ocaml-4.10.2-patches-1.tar.bz2 3180 BLAKE2B 474471e10c4525e4da730fcf8602fddf5209f7d8eb15bd76894ed2bc22213a6e61aa7f52b1b67dff6c8bf04eac7d759ada28f1783c83a075cc65e7e5caadc715 SHA512 1456f90c0c833461eb9d1c140ba1a7358aa9351f6303e83b0e19bb8688dcb17bdad211f4cec1281a47180bbdddcfdbf44367b47a6b301d2ea41fa9d926bd03a5 DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528 SHA512 1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2 DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06 SHA512 03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3 DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B 9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f SHA512 e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671 diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch deleted file mode 100644 index d95d2bb0fa50.. --- a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch +++ /dev/null @@ -1,186 +0,0 @@ -https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f -https://bugs.gentoo.org/804498 - -From 50c2d1275e537906ea144bd557fde31e0bf16e5f Mon Sep 17 00:00:00 2001 -From: Xavier Leroy -Date: Fri, 5 Mar 2021 19:14:07 +0100 -Subject: [PATCH] Dynamically allocate the alternate signal stack - -In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant. -It is no longer possible to statically allocate the alternate signal -stack for the main thread, as we've been doing for the last 25 years. - -This commit implements dynamic allocation of the alternate signal stack -even for the main thread. It reuses the code already in place to allocate -the alternate signal stack for other threads. - -The alternate signal stack is freed when the main OCaml code / an OCaml thread -stops. - -(partial back-port of PR#10266 and PR#10726) a/asmrun/fail.c -+++ b/asmrun/fail.c -@@ -31,6 +31,8 @@ - #include "caml/roots.h" - #include "caml/callback.h" - -+extern void caml_terminate_signals(void); -+ - /* The globals holding predefined exceptions */ - - typedef value caml_generated_constant[1]; -@@ -60,7 +62,10
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/
commit: b25f82e790bbcf0f05f434212958ae2e192df08e Author: Sam James gentoo org> AuthorDate: Tue Feb 22 00:46:37 2022 + Commit: Sam James gentoo org> CommitDate: Tue Feb 22 00:46:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25f82e7 dev-lang/ocaml: scrub patches Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch | 20 +- dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch | 15 -- dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 24 +++--- dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch | 15 -- dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch | 16 +++ dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch | 18 6 files changed, 30 insertions(+), 78 deletions(-) diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch index a0c67da534a0..8b2e99883167 100644 --- a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch +++ b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch @@ -1,5 +1,5 @@ a/byterun/caml/intext.h2021-01-28 22:46:20.400224678 +0100 -+++ b/byterun/caml/intext.h2021-01-28 22:46:49.312751054 +0100 +--- a/byterun/caml/intext.h b/byterun/caml/intext.h @@ -196,7 +196,7 @@ CAMLextern struct code_fragment * caml_extern_find_code(char *addr); @@ -9,8 +9,8 @@ #endif /* CAML_INTERNALS */ a/byterun/caml/major_gc.h 2021-01-28 22:44:12.193323457 +0100 -+++ b/byterun/caml/major_gc.h 2021-01-28 22:45:20.918198701 +0100 +--- a/byterun/caml/major_gc.h b/byterun/caml/major_gc.h @@ -64,9 +64,9 @@ extern char *caml_gc_sweep_hp; @@ -24,8 +24,8 @@ extern double caml_gc_clock; /* [caml_major_gc_hook] is called just between the end of the mark a/byterun/meta.c 2021-01-28 22:47:34.148016359 +0100 -+++ b/byterun/meta.c 2021-01-28 22:47:56.048657393 +0100 +--- a/byterun/meta.c b/byterun/meta.c @@ -32,6 +32,8 @@ #include "caml/prims.h" #include "caml/stacks.h" @@ -35,8 +35,8 @@ #ifndef NATIVE_CODE CAMLprim value caml_get_global_data(value unit) a/byterun/backtrace.c 2021-01-28 22:50:25.275226598 +0100 -+++ b/byterun/backtrace.c 2021-01-28 22:50:37.541027290 +0100 +--- a/byterun/backtrace.c b/byterun/backtrace.c @@ -28,7 +28,7 @@ #include "caml/fail.h" @@ -46,8 +46,8 @@ CAMLexport int32_t caml_backtrace_active = 0; CAMLexport int32_t caml_backtrace_pos = 0; a/asmrun/startup.c 2021-01-28 23:02:50.526072662 +0100 -+++ b/asmrun/startup.c 2021-01-28 23:03:09.977754311 +0100 +--- a/asmrun/startup.c b/asmrun/startup.c @@ -44,7 +44,7 @@ #endif diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch index 28d7f48f5b27..d95d2bb0fa50 100644 --- a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch +++ b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch @@ -18,15 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread stops. (partial back-port of PR#10266 and PR#10726) - asmrun/fail.c| 7 - - asmrun/signals_asm.c | 69 ++-- - asmrun/startup.c | 7 - - byterun/sys.c| 5 - 4 files changed, 77 insertions(+), 11 deletions(-) - -diff --git a/asmrun/fail.c b/asmrun/fail.c -index d73cb88524c..2f064320185 100644 --- a/asmrun/fail.c +++ b/asmrun/fail.c @@ -31,6 +31,8 @@ @@ -50,8 +41,6 @@ index d73cb88524c..2f064320185 100644 #ifndef Stack_grows_upwards #define PUSHED_AFTER < -diff --git a/asmrun/signals_asm.c b/asmrun/signals_asm.c -index f124a076749..b4e2516ae1a 100644 --- a/asmrun/signals_asm.c +++ b/asmrun/signals_asm.c @@ -194,7 +194,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler) @@ -140,8 +129,6 @@ index f124a076749..b4e2516ae1a 100644 + } +#endif +} -diff --git a/asmrun/startup.c b/asmrun/startup.c -index 70bbc4369dc..a1cb06a7d1e 100644 --- a/asmrun/startup.c +++ b/asmrun/startup.c @@ -92,6 +92,7 @@ void (*caml_termination_hook)(void *) = NULL; @@ -175,8 +162,6 @@ index 70bbc4369dc..a1cb06a7d1e 100644 } void caml_startup(char **argv) -diff --git a/byterun/sys.c b/byterun/sys.c -index 3706e9002d5..aa152239ebf 100644 --- a/byterun/sys.c +++ b/byterun/sys.c @@ -111,6 +111,8 @@ static void caml_sys_check_path(value name) diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch index 8d2391407a35..d0a947da0ea6 100644 --- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch +++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch @@ -1,5 +1,5 @@ a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100 -+++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100 +--- a/runtime/Makefile b/runtime/Makefile @@ -335,7 +335,7 @@ # (without the extension, which is added by the macro) define COMPILE_C_FILE @@ -9,24 +9,24 @@ endef
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: 08d38917b110ea52b3107556e283498a09a89a36
Author: Sam James gentoo org>
AuthorDate: Tue Feb 22 00:35:29 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 22 00:41:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d38917
dev-lang/ocaml: fix 4.10 with glibc 2.34
Bug: https://bugs.gentoo.org/804498
See: https://github.com/gentoo/gentoo/pull/22851#pullrequestreview-882504245
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch | 257 +
dev-lang/ocaml/ocaml-4.10.2-r3.ebuild | 106 +
2 files changed, 363 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch
b/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch
new file mode 100644
index ..8ce76701366a
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch
@@ -0,0 +1,257 @@
+https://github.com/ocaml/ocaml/commit/4b4c643d1d5d28738f6d900cd902851ed9dc5364
+https://bugs.gentoo.org/804498
+
+From 4b4c643d1d5d28738f6d900cd902851ed9dc5364 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH] Dynamically allocate the alternate signal stack
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread. It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+The alternate signal stack is freed when the main OCaml code / an OCaml thread
+stops.
+
+(partial back-port of PR#10266 and PR#10726)
+---
+ otherlibs/systhreads/st_stubs.c | 2 +
+ runtime/fail_nat.c | 7 ++-
+ runtime/signals_nat.c | 87 -
+ runtime/startup_nat.c | 7 ++-
+ runtime/sys.c | 5 ++
+ 5 files changed, 95 insertions(+), 13 deletions(-)
+
+diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c
+index e46a67be9dc..0b441934ae9 100644
+--- a/otherlibs/systhreads/st_stubs.c
b/otherlibs/systhreads/st_stubs.c
+@@ -140,6 +140,7 @@ static st_retcode caml_threadstatus_wait (value);
+ #ifdef NATIVE_CODE
+ extern struct longjmp_buffer caml_termination_jmpbuf;
+ extern void (*caml_termination_hook)(void);
++extern int caml_stop_stack_overflow_detection(void);
+ #endif
+
+ /* Hook for scanning the stacks of the other threads */
+@@ -576,6 +577,7 @@ static ST_THREAD_FUNCTION caml_thread_start(void * arg)
+ caml_thread_stop();
+ #ifdef NATIVE_CODE
+ }
++ caml_stop_stack_overflow_detection();
+ #endif
+ /* The thread now stops running */
+ return 0;
+diff --git a/runtime/fail_nat.c b/runtime/fail_nat.c
+index 380578ac47b..4ea658684b4 100644
+--- a/runtime/fail_nat.c
b/runtime/fail_nat.c
+@@ -32,6 +32,8 @@
+ #include "caml/roots.h"
+ #include "caml/callback.h"
+
++extern void caml_terminate_signals(void);
++
+ /* The globals holding predefined exceptions */
+
+ typedef value caml_generated_constant[1];
+@@ -62,7 +64,10 @@ CAMLno_asan
+ void caml_raise(value v)
+ {
+ Unlock_exn();
+- if (Caml_state->exception_pointer == NULL) caml_fatal_uncaught_exception(v);
++ if (Caml_state->exception_pointer == NULL) {
++caml_terminate_signals();
++caml_fatal_uncaught_exception(v);
++ }
+
+ while (Caml_state->local_roots != NULL &&
+ (char *) Caml_state->local_roots < Caml_state->exception_pointer) {
+diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c
+index 017298394e9..b4c58259fc2 100644
+--- a/runtime/signals_nat.c
b/runtime/signals_nat.c
+@@ -191,8 +191,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined"
+ #endif
+
+-static char sig_alt_stack[SIGSTKSZ];
+-
+ /* Code compiled with ocamlopt never accesses more than
+EXTRA_STACK bytes below the stack pointer. */
+ #define EXTRA_STACK 256
+@@ -254,6 +252,10 @@ DECLARE_SIGNAL_HANDLER(segv_handler)
+
+ /* Initialization of signal stuff */
+
++#ifdef HAS_STACK_OVERFLOW_DETECTION
++static int setup_stack_overflow_detection(void);
++#endif
++
+ void caml_init_signals(void)
+ {
+ /* Bound-check trap handling */
+@@ -278,28 +280,91 @@ void caml_init_signals(void)
+ #endif
+
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+- {
+-stack_t stk;
++ if (setup_stack_overflow_detection() != -1) {
+ struct sigaction act;
+-stk.ss_sp = sig_alt_stack;
+-stk.ss_size = SIGSTKSZ;
+-stk.ss_flags = 0;
+ SET_SIGACT(act, segv_handler);
+ act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+ sigemptyset(_mask);
+-if (sigaltstack(, NULL) == 0) { sigaction(SIGSEGV, , NULL); }
++sigaction(SIGSEGV, , NULL);
+ }
+ #endif
+ }
+
+-void caml_setup_stack_overflow_detection(void)
++/* Termination of signal stuff */
++
++#if
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: 860e2f272f0a0a2fecb2ab6f160ce68875770f59
Author: Sam James gentoo org>
AuthorDate: Tue Feb 22 00:40:45 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 22 00:41:14 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=860e2f27
dev-lang/ocaml: fix 4.05 with glibc 2.34
Bug: https://bugs.gentoo.org/804498
See: https://github.com/gentoo/gentoo/pull/22851#pullrequestreview-882504245
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch | 201 +
dev-lang/ocaml/ocaml-4.05.0-r9.ebuild | 157
2 files changed, 358 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch
b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch
new file mode 100644
index ..28d7f48f5b27
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch
@@ -0,0 +1,201 @@
+https://github.com/ocaml/ocaml/commit/50c2d1275e537906ea144bd557fde31e0bf16e5f
+https://bugs.gentoo.org/804498
+
+From 50c2d1275e537906ea144bd557fde31e0bf16e5f Mon Sep 17 00:00:00 2001
+From: Xavier Leroy
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH] Dynamically allocate the alternate signal stack
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread. It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+The alternate signal stack is freed when the main OCaml code / an OCaml thread
+stops.
+
+(partial back-port of PR#10266 and PR#10726)
+---
+ asmrun/fail.c| 7 -
+ asmrun/signals_asm.c | 69 ++--
+ asmrun/startup.c | 7 -
+ byterun/sys.c| 5
+ 4 files changed, 77 insertions(+), 11 deletions(-)
+
+diff --git a/asmrun/fail.c b/asmrun/fail.c
+index d73cb88524c..2f064320185 100644
+--- a/asmrun/fail.c
b/asmrun/fail.c
+@@ -31,6 +31,8 @@
+ #include "caml/roots.h"
+ #include "caml/callback.h"
+
++extern void caml_terminate_signals(void);
++
+ /* The globals holding predefined exceptions */
+
+ typedef value caml_generated_constant[1];
+@@ -60,7 +62,10 @@ char * caml_exception_pointer = NULL;
+ void caml_raise(value v)
+ {
+ Unlock_exn();
+- if (caml_exception_pointer == NULL) caml_fatal_uncaught_exception(v);
++ if (caml_exception_pointer == NULL) {
++caml_terminate_signals();
++caml_fatal_uncaught_exception(v);
++ }
+
+ #ifndef Stack_grows_upwards
+ #define PUSHED_AFTER <
+diff --git a/asmrun/signals_asm.c b/asmrun/signals_asm.c
+index f124a076749..b4e2516ae1a 100644
+--- a/asmrun/signals_asm.c
b/asmrun/signals_asm.c
+@@ -194,7 +194,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+
+ static char * system_stack_top;
+-static char sig_alt_stack[SIGSTKSZ];
+
+ #if defined(SYS_linux)
+ /* PR#4746: recent Linux kernels with support for stack randomization
+@@ -295,17 +294,69 @@ void caml_init_signals(void)
+ {
+ stack_t stk;
+ struct sigaction act;
+-stk.ss_sp = sig_alt_stack;
+-stk.ss_size = SIGSTKSZ;
+-stk.ss_flags = 0;
+-SET_SIGACT(act, segv_handler);
+-act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+-sigemptyset(_mask);
+-system_stack_top = (char *)
+-if (sigaltstack(, NULL) == 0) { sigaction(SIGSEGV, , NULL); }
++/* Allocate and select an alternate stack for handling signals,
++ especially SIGSEGV signals.
++ The alternate stack used to be statically-allocated for the main
thread,
++ but this is incompatible with Glibc 2.34 and newer, where SIGSTKSZ
++ may not be a compile-time constant. */
++stk.ss_sp = malloc(SIGSTKSZ);
++if (stk.ss_sp != NULL) {
++ stk.ss_size = SIGSTKSZ;
++ stk.ss_flags = 0;
++ SET_SIGACT(act, segv_handler);
++ act.sa_flags |= SA_ONSTACK | SA_NODEFER;
++ sigemptyset(_mask);
++ system_stack_top = (char *)
++ if (sigaltstack(, NULL) == 0)
++sigaction(SIGSEGV, , NULL);
++ else
++free(stk.ss_sp);
++}
+ }
+ #endif
+ #if defined(_WIN32) && !defined(_WIN64)
+ caml_win32_overflow_detection();
+ #endif
+ }
++
++/* Termination of signal stuff */
++
++#if defined(TARGET_power) || defined(TARGET_s390x) \
++|| defined(TARGET_sparc) && defined(SYS_solaris) \
++|| defined(HAS_STACK_OVERFLOW_DETECTION)
++static void set_signal_default(int signum)
++{
++ struct sigaction act;
++ sigemptyset(_mask);
++ act.sa_handler = SIG_DFL;
++ act.sa_flags = 0;
++ sigaction(signum, , NULL);
++}
++#endif
++
++void caml_terminate_signals(void)
++{
++#if defined(TARGET_sparc) && defined(SYS_solaris)
++ set_signal_default(SIGILL);
++#endif
++
++#if defined(TARGET_power)
++ set_signal_default(SIGTRAP);
++#endif
++
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: a5945b83a4ee29d228e1a56101483001da291c54
Author: Sam James gentoo org>
AuthorDate: Tue Feb 22 00:29:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Feb 22 00:41:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5945b83
dev-lang/ocaml: fix 4.09 with glibc 2.34
Bug: https://bugs.gentoo.org/804498
See: https://github.com/gentoo/gentoo/pull/22851#pullrequestreview-882504245
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch | 193 +
dev-lang/ocaml/ocaml-4.09.0-r3.ebuild | 105 +++
2 files changed, 298 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch
b/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch
new file mode 100644
index ..6f74d38e80b6
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch
@@ -0,0 +1,193 @@
+https://github.com/ocaml/ocaml/commit/8eed2e441222588dc385a98ae8bd6f5820eb0223
+https://github.com/gentoo/gentoo/pull/22851#pullrequestreview-882504245
+
+From 8eed2e441222588dc385a98ae8bd6f5820eb0223 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH] Dynamically allocate the alternate signal stack
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread. It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+The alternate signal stack is freed when the main OCaml code / an OCaml thread
+stops.
+
+(partial back-port of PR#10266 and PR#10726)
+---
+ runtime/fail_nat.c| 7 -
+ runtime/signals_nat.c | 64 +--
+ runtime/startup_nat.c | 7 -
+ runtime/sys.c | 5
+ 4 files changed, 72 insertions(+), 11 deletions(-)
+
+diff --git a/runtime/fail_nat.c b/runtime/fail_nat.c
+index e1f687d379e..cbf7633ee9e 100644
+--- a/runtime/fail_nat.c
b/runtime/fail_nat.c
+@@ -31,6 +31,8 @@
+ #include "caml/roots.h"
+ #include "caml/callback.h"
+
++extern void caml_terminate_signals(void);
++
+ /* The globals holding predefined exceptions */
+
+ typedef value caml_generated_constant[1];
+@@ -60,7 +62,10 @@ char * caml_exception_pointer = NULL;
+ void caml_raise(value v)
+ {
+ Unlock_exn();
+- if (caml_exception_pointer == NULL) caml_fatal_uncaught_exception(v);
++ if (caml_exception_pointer == NULL) {
++caml_terminate_signals();
++caml_fatal_uncaught_exception(v);
++ }
+
+ while (caml_local_roots != NULL &&
+ (char *) caml_local_roots < caml_exception_pointer) {
+diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c
+index 29a5f49e625..351b575a08e 100644
+--- a/runtime/signals_nat.c
b/runtime/signals_nat.c
+@@ -182,7 +182,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+
+ static char * system_stack_top;
+-static char sig_alt_stack[SIGSTKSZ];
+
+ #if defined(SYS_linux)
+ /* PR#4746: recent Linux kernels with support for stack randomization
+@@ -275,14 +274,61 @@ void caml_init_signals(void)
+ {
+ stack_t stk;
+ struct sigaction act;
+-stk.ss_sp = sig_alt_stack;
+-stk.ss_size = SIGSTKSZ;
+-stk.ss_flags = 0;
+-SET_SIGACT(act, segv_handler);
+-act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+-sigemptyset(_mask);
+-system_stack_top = (char *)
+-if (sigaltstack(, NULL) == 0) { sigaction(SIGSEGV, , NULL); }
++/* Allocate and select an alternate stack for handling signals,
++ especially SIGSEGV signals.
++ The alternate stack used to be statically-allocated for the main
thread,
++ but this is incompatible with Glibc 2.34 and newer, where SIGSTKSZ
++ may not be a compile-time constant. */
++stk.ss_sp = malloc(SIGSTKSZ);
++if (stk.ss_sp != NULL) {
++ stk.ss_size = SIGSTKSZ;
++ stk.ss_flags = 0;
++ SET_SIGACT(act, segv_handler);
++ act.sa_flags |= SA_ONSTACK | SA_NODEFER;
++ sigemptyset(_mask);
++ system_stack_top = (char *)
++ if (sigaltstack(, NULL) == 0)
++sigaction(SIGSEGV, , NULL);
++ else
++free(stk.ss_sp);
++}
++ }
++#endif
++}
++
++/* Termination of signal stuff */
++
++#if defined(TARGET_power) || defined(TARGET_s390x) \
++|| defined(HAS_STACK_OVERFLOW_DETECTION)
++static void set_signal_default(int signum)
++{
++ struct sigaction act;
++ sigemptyset(_mask);
++ act.sa_handler = SIG_DFL;
++ act.sa_flags = 0;
++ sigaction(signum, , NULL);
++}
++#endif
++
++void caml_terminate_signals(void)
++{
++#if defined(TARGET_power)
++ set_signal_default(SIGTRAP);
++#endif
++
++#if defined(TARGET_s390x)
++ set_signal_default(SIGFPE);
++#endif
++
++#ifdef HAS_STACK_OVERFLOW_DETECTION
++
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: b621f163b9af5f8949f0ce1ce1bc13651562b3ff Author: Alfredo Tupone gentoo org> AuthorDate: Sun Jan 23 18:13:37 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Sun Jan 23 18:13:37 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b621f163 dev-lang/ocaml: respect CFLAGS Closes: https://bugs.gentoo.org/719166 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 11 ++ ...09.0-cflags.patch => ocaml-4.10.2-cflags.patch} | 46 -- dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 4 +- dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 4 +- dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 2 + dev-lang/ocaml/ocaml-4.10.2-r2.ebuild | 8 +++- dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 5 ++- dev-lang/ocaml/ocaml-4.12.1.ebuild | 4 +- dev-lang/ocaml/ocaml-4.13.1.ebuild | 4 +- 9 files changed, 53 insertions(+), 35 deletions(-) diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch index 920cd32264b6..8d2391407a35 100644 --- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch +++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch @@ -52,3 +52,14 @@ -I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \ -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \ $(OUTPUTOBJ)$@ -c $< +--- a/tools/Makefile 2022-01-23 09:57:00.788877931 +0100 b/tools/Makefile 2022-01-23 09:57:21.735516656 +0100 +@@ -322,7 +322,7 @@ + endif + + objinfo_helper$(EXE): objinfo_helper.c $(ROOTDIR)/runtime/caml/s.h +- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime $(OUTPUTEXE)$@ \ ++ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime $(OUTPUTEXE)$@ \ + $(DEF_SYMBOL_PREFIX) $(LIBBFD_INCLUDE) $< $(LIBBFD_LINK) + + OBJINFO=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \ diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch similarity index 54% copy from dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch copy to dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch index 920cd32264b6..01117c39887d 100644 --- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch +++ b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch @@ -9,14 +9,6 @@ endef object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic a/yacc/Makefile2022-01-22 20:02:56.510340885 +0100 -+++ b/yacc/Makefile2022-01-22 20:03:14.998000508 +0100 -@@ -63,4 +63,4 @@ - # also works for .obj files. - - %.$(O): %.c -- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< -+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< --- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100 +++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100 @@ -138,4 +138,4 @@ @@ -25,30 +17,26 @@ .c.$(O): - $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< + $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< a/ocamltest/Makefile 2022-01-22 20:30:22.454009704 +0100 -+++ b/ocamltest/Makefile 2022-01-22 20:30:33.845799603 +0100 -@@ -221,7 +221,7 @@ - $(ocamllex) -q $< - - %.$(O): %.c -- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -c $< -+ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -c $< - - ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config - sed \ --- a/otherlibs/systhreads/Makefile2022-01-22 20:42:17.647349876 +0100 +++ b/otherlibs/systhreads/Makefile2022-01-22 20:43:29.766086103 +0100 -@@ -93,11 +93,11 @@ - # twice, each time with different options). +@@ -102,10 +102,10 @@ + st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS) st_stubs_b.$(O): st_stubs.c $(HEADER) -- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \ -+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \ - $(SHAREDLIB_CFLAGS) $(OUTPUTOBJ)$@ $< +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< st_stubs_n.$(O): st_stubs.c $(HEADER) -- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) \ -+ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) \ - -I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \ - -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \ - $(OUTPUTOBJ)$@ -c $< +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< ++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $< + + partialclean: + rm -f *.cm* +--- a/Makefile.common.in 2022-01-23 18:05:04.192323554 +0100 b/Makefile.common.in 2022-01-23 18:05:17.211122643 +0100 +@@ -79,4 +79,4 @@ + # general (it supports both .o and .obj) + + %.$(O): %.c +- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS)
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: aa94926bbf041302507bd8a121edba782f0d2afc
Author: Alfredo Tupone gentoo org>
AuthorDate: Sat Jan 22 20:25:03 2022 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Sat Jan 22 20:25:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa94926b
dev-lang/ocaml: respect CFLAGS for ocaml-4.09
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 54 ++
dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 7 +++-
2 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
new file mode 100644
index ..920cd32264b6
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
@@ -0,0 +1,54 @@
+--- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100
b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100
+@@ -335,7 +335,7 @@
+ # (without the extension, which is added by the macro)
+ define COMPILE_C_FILE
+ $(1).$(O): %.c
+- $$(CC) -c $$(OC_CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
++ $$(CC) -c $$(OC_CFLAGS) $(CFLAGS) $$(OC_CPPFLAGS) $$(OUTPUTOBJ)$$@ $$<
+ endef
+
+ object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
+--- a/yacc/Makefile2022-01-22 20:02:56.510340885 +0100
b/yacc/Makefile2022-01-22 20:03:14.998000508 +0100
+@@ -63,4 +63,4 @@
+ # also works for .obj files.
+
+ %.$(O): %.c
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+--- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625
+0100
b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701
+0100
+@@ -138,4 +138,4 @@
+ $(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
+
+ .c.$(O):
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+--- a/ocamltest/Makefile 2022-01-22 20:30:22.454009704 +0100
b/ocamltest/Makefile 2022-01-22 20:30:33.845799603 +0100
+@@ -221,7 +221,7 @@
+ $(ocamllex) -q $<
+
+ %.$(O): %.c
+- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) -c $<
++ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -c $<
+
+ ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config
+ sed \
+--- a/otherlibs/systhreads/Makefile2022-01-22 20:42:17.647349876 +0100
b/otherlibs/systhreads/Makefile2022-01-22 20:43:29.766086103 +0100
+@@ -93,11 +93,11 @@
+ # twice, each time with different options).
+
+ st_stubs_b.$(O): st_stubs.c $(HEADER)
+- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \
++ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) -I$(ROOTDIR)/runtime \
+ $(SHAREDLIB_CFLAGS) $(OUTPUTOBJ)$@ $<
+
+ st_stubs_n.$(O): st_stubs.c $(HEADER)
+- $(CC) $(OC_CFLAGS) $(OC_CPPFLAGS) \
++ $(CC) $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) \
+ -I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \
+ -DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \
+ $(OUTPUTOBJ)$@ -c $<
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
index 68b58ca86b18..ca9871a0c358 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -21,7 +21,10 @@ BDEPEND="${RDEPEND}
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
-PATCHES=( "${FILESDIR}"/${PN}-4.09.0-gcc-10.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.09.0-gcc-10.patch
+ "${FILESDIR}"/${P}-cflags.patch
+)
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 4eb0437eccbafc2ad017160fc28f14024508d784 Author: Sam James gentoo org> AuthorDate: Sun Oct 17 19:08:12 2021 + Commit: Sam James gentoo org> CommitDate: Sun Oct 17 19:08:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eb0437e dev-lang/ocaml: Stabilize 4.11.2-r2 arm64, #804774 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild index 51cc9f56afa..cbc5b7cb458 100644 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: c309652d566cedeb0c93c8b1a08569f54545d354
Author: Sam James gentoo org>
AuthorDate: Sun Oct 17 05:16:49 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 17 05:24:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c309652d
dev-lang/ocaml: fix build with glibc-2.34 in 4.11.2
Closes: https://bugs.gentoo.org/804498
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch | 91 ++
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 4 +
2 files changed, 95 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch
b/dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch
new file mode 100644
index 000..22cbb806e6e
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.11.2-glibc-2.34.patch
@@ -0,0 +1,91 @@
+https://gitlab.com/redhat/centos-stream/rpms/ocaml/-/raw/c9s/0006-Dynamically-allocate-the-alternate-signal-stack-1026.patch
+https://bugs.gentoo.org/804498
+
+From 24a9db7784ddfcf0af2d2be2f51616ed960ae7e8 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH 6/6] Dynamically allocate the alternate signal stack (#10266)
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread. It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+Fixes: #10250.
+(cherry picked from commit fc9534746bf5d08a4c109f22e344cf49d5d46d54)
+--- a/runtime/caml/signals.h
b/runtime/caml/signals.h
+@@ -82,7 +82,7 @@ void caml_set_action_pending (void);
+ value caml_do_pending_actions_exn (void);
+ value caml_process_pending_actions_with_root (value extra_root); // raises
+ int caml_set_signal_action(int signo, int action);
+-void caml_setup_stack_overflow_detection(void);
++CAMLextern int caml_setup_stack_overflow_detection(void);
+
+ CAMLextern void (*caml_enter_blocking_section_hook)(void);
+ CAMLextern void (*caml_leave_blocking_section_hook)(void);
+--- a/runtime/signals_byt.c
b/runtime/signals_byt.c
+@@ -86,4 +86,4 @@ int caml_set_signal_action(int signo, int action)
+ return 0;
+ }
+
+-void caml_setup_stack_overflow_detection(void) {}
++CAMLexport int caml_setup_stack_overflow_detection(void) { return 0; }
+--- a/runtime/signals_nat.c
b/runtime/signals_nat.c
+@@ -195,8 +195,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined"
+ #endif
+
+-static char sig_alt_stack[SIGSTKSZ];
+-
+ /* Code compiled with ocamlopt never accesses more than
+EXTRA_STACK bytes below the stack pointer. */
+ #define EXTRA_STACK 256
+@@ -282,28 +280,33 @@ void caml_init_signals(void)
+ #endif
+
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+- {
+-stack_t stk;
++ if (caml_setup_stack_overflow_detection() != -1) {
+ struct sigaction act;
+-stk.ss_sp = sig_alt_stack;
+-stk.ss_size = SIGSTKSZ;
+-stk.ss_flags = 0;
+ SET_SIGACT(act, segv_handler);
+ act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+ sigemptyset(_mask);
+-if (sigaltstack(, NULL) == 0) { sigaction(SIGSEGV, , NULL); }
++sigaction(SIGSEGV, , NULL);
+ }
+ #endif
+ }
+
+-void caml_setup_stack_overflow_detection(void)
++/* Allocate and select an alternate stack for handling signals,
++ especially SIGSEGV signals.
++ Each thread needs its own alternate stack.
++ The alternate stack used to be statically-allocated for the main thread,
++ but this is incompatible with Glibc 2.34 and newer, where SIGSTKSZ
++ may not be a compile-time constant (issue #10250). */
++
++CAMLexport int caml_setup_stack_overflow_detection(void)
+ {
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+ stack_t stk;
+ stk.ss_sp = malloc(SIGSTKSZ);
++ if (stk.ss_sp == NULL) return -1;
+ stk.ss_size = SIGSTKSZ;
+ stk.ss_flags = 0;
+- if (stk.ss_sp)
+-sigaltstack(, NULL);
++ return sigaltstack(, NULL);
++#else
++ return 0;
+ #endif
+ }
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 2d52afb654e..51cc9f56afa 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -21,6 +21,10 @@ BDEPEND="${RDEPEND}
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.11.2-glibc-2.34.patch
+)
+
src_prepare() {
default
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: d88a997f7cfdfdb5aa7ce4e24a3d60b9d0d2ddd7 Author: Sam James gentoo org> AuthorDate: Sun Oct 17 00:12:49 2021 + Commit: Sam James gentoo org> CommitDate: Sun Oct 17 00:12:49 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88a997f dev-lang/ocaml: Stabilize 4.11.2-r2 arm, #804774 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild index f8605967166..2d52afb654e 100644 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: a491173ff44e4981d6cdaf9f0856cb23a45393ec
Author: Sam James gentoo org>
AuthorDate: Sat Oct 16 10:31:42 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 16 10:31:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a491173f
dev-lang/ocaml: filter -flto* too
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 4 ++--
dev-lang/ocaml/ocaml-4.10.2-r2.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
index 9ef969d018b..68a369bcebf 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@@ -68,7 +68,7 @@ src_configure() {
# Broken until 4.12
# bug #818445
- filter-flags -flto
+ filter-flags '-flto*'
append-flags -fno-strict-aliasing
# -ggdb3 & co makes it behave weirdly, breaks sexplib
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
index 707f584fb23..4c2da17dac5 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
@@ -69,7 +69,7 @@ src_configure() {
# Broken until 4.12
# bug #818445
- filter-flags -flto
+ filter-flags '-flto*'
append-flags -fno-strict-aliasing
# -ggdb3 & co makes it behave weirdly, breaks sexplib
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
index b9f00b2cfe0..68b58ca86b1 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
@@ -21,7 +21,7 @@ BDEPEND="${RDEPEND}
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
-PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
+PATCHES=( "${FILESDIR}"/${PN}-4.09.0-gcc-10.patch )
src_prepare() {
default
@@ -30,7 +30,7 @@ src_prepare() {
# Broken until 4.12
# bug #818445
- filter-flags -flto
+ filter-flags '-flto*'
append-flags -fno-strict-aliasing
# OCaml generates textrels on 32-bit arches
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
index 69ae1931963..3b6334a9c87 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
# Broken until 4.12
# bug #818445
- filter-flags -flto
+ filter-flags '-flto*'
append-flags -fno-strict-aliasing
# OCaml generates textrels on 32-bit arches
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 001fbf26fdf..e965a0afa51 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -28,7 +28,7 @@ src_prepare() {
# Broken until 4.12
# bug #818445
- filter-flags -flto
+ filter-flags '-flto*'
append-flags -fno-strict-aliasing
# OCaml generates textrels on 32-bit arches
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 04eb86bc87e3a854927784268005115f021188bc
Author: Sam James gentoo org>
AuthorDate: Sat Oct 16 10:14:26 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 16 10:14:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04eb86bc
dev-lang/ocaml: filter LTO, no strict aliasing in <4.12
Bug: https://bugs.gentoo.org/818445
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 5 +
dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 5 +
dev-lang/ocaml/ocaml-4.09.0-r2.ebuild | 5 +
dev-lang/ocaml/ocaml-4.10.2-r2.ebuild | 5 +
dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 5 +
5 files changed, 25 insertions(+)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
index 7604e5ba353..9ef969d018b 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@@ -66,6 +66,11 @@ src_configure() {
# Bug #285993
filter-mfpmath sse
+ # Broken until 4.12
+ # bug #818445
+ filter-flags -flto
+ append-flags -fno-strict-aliasing
+
# -ggdb3 & co makes it behave weirdly, breaks sexplib
replace-flags -ggdb* -ggdb
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
index aab387a1042..707f584fb23 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
@@ -67,6 +67,11 @@ src_configure() {
# Bug #285993
filter-mfpmath sse
+ # Broken until 4.12
+ # bug #818445
+ filter-flags -flto
+ append-flags -fno-strict-aliasing
+
# -ggdb3 & co makes it behave weirdly, breaks sexplib
replace-flags -ggdb* -ggdb
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
index 23d27276013..b9f00b2cfe0 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
@@ -28,6 +28,11 @@ src_prepare() {
cp "${FILESDIR}"/ocaml.conf "${T}" || die
+ # Broken until 4.12
+ # bug #818445
+ filter-flags -flto
+ append-flags -fno-strict-aliasing
+
# OCaml generates textrels on 32-bit arches
# We can't do anything about it, but disabling it means that tests
# for OCaml-based packages won't fail on unexpected output
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
index 7203dec65d6..69ae1931963 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
@@ -26,6 +26,11 @@ src_prepare() {
cp "${FILESDIR}"/ocaml.conf "${T}" || die
+ # Broken until 4.12
+ # bug #818445
+ filter-flags -flto
+ append-flags -fno-strict-aliasing
+
# OCaml generates textrels on 32-bit arches
# We can't do anything about it, but disabling it means that tests
# for OCaml-based packages won't fail on unexpected output
diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
index 464822a6bd4..001fbf26fdf 100644
--- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild
@@ -26,6 +26,11 @@ src_prepare() {
cp "${FILESDIR}"/ocaml.conf "${T}" || die
+ # Broken until 4.12
+ # bug #818445
+ filter-flags -flto
+ append-flags -fno-strict-aliasing
+
# OCaml generates textrels on 32-bit arches
# We can't do anything about it, but disabling it means that tests
# for OCaml-based packages won't fail on unexpected output
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 15e01a2ca58f7fd6dfbfa9c42d18747f02f3fae4 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 13 06:01:52 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 13 06:01:52 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e01a2c dev-lang/ocaml: x86 stable wrt bug #804774 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild index 25d0a9ce52e..464822a6bd4 100644 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 778f64a97c5f2cf1074bf3771aae00321f43838f Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Oct 13 05:54:00 2021 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Oct 13 05:54:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778f64a9 dev-lang/ocaml: amd64 stable wrt bug #804774 Package-Manager: Portage-3.0.20, Repoman-3.0.3 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> dev-lang/ocaml/ocaml-4.11.2-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild index 3ef5a4d1015..25d0a9ce52e 100644 --- a/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild +++ b/dev-lang/ocaml/ocaml-4.11.2-r2.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Programming language supporting functional, imperative & object-ori LICENSE="QPL-1.0 LGPL-2" SLOT="0/$(ver_cut 1-2)" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" IUSE="emacs flambda latex +ocamlopt spacetime xemacs" RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: 474a14bc9ede109fb7a8033667f42b6f63720962
Author: Sam James gentoo org>
AuthorDate: Sat Oct 9 05:54:21 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 9 05:55:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=474a14bc
dev-lang/ocaml: fix build with glibc 2.34
Closes: https://bugs.gentoo.org/816765
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch | 91 ++
dev-lang/ocaml/ocaml-4.12.0-r2.ebuild | 4 +
dev-lang/ocaml/ocaml-4.12.1.ebuild | 4 +
3 files changed, 99 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch
b/dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch
new file mode 100644
index 000..486b44846a8
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.12.0-glibc-2.34.patch
@@ -0,0 +1,91 @@
+https://src.fedoraproject.org/rpms/ocaml/blob/129153b85109944bf0b2922949f77ef8f32b39a1/f/0004-Dynamically-allocate-the-alternate-signal-stack-1026.patch
+https://bugs.gentoo.org/816765
+
+From 3104d92743614f8f52039e0520116af4179880a5 Mon Sep 17 00:00:00 2001
+From: Xavier Leroy
+Date: Fri, 5 Mar 2021 19:14:07 +0100
+Subject: [PATCH 4/4] Dynamically allocate the alternate signal stack (#10266)
+
+In Glibc 2.34 and later, SIGSTKSZ may not be a compile-time constant.
+It is no longer possible to statically allocate the alternate signal
+stack for the main thread, as we've been doing for the last 25 years.
+
+This commit implements dynamic allocation of the alternate signal stack
+even for the main thread. It reuses the code already in place to allocate
+the alternate signal stack for other threads.
+
+Fixes: #10250.
+(cherry picked from commit fc9534746bf5d08a4c109f22e344cf49d5d46d54)
+--- a/runtime/caml/signals.h
b/runtime/caml/signals.h
+@@ -87,7 +87,7 @@ value caml_do_pending_actions_exn (void);
+ value caml_process_pending_actions_with_root (value extra_root); // raises
+ value caml_process_pending_actions_with_root_exn (value extra_root);
+ int caml_set_signal_action(int signo, int action);
+-CAMLextern void caml_setup_stack_overflow_detection(void);
++CAMLextern int caml_setup_stack_overflow_detection(void);
+
+ CAMLextern void (*caml_enter_blocking_section_hook)(void);
+ CAMLextern void (*caml_leave_blocking_section_hook)(void);
+--- a/runtime/signals_byt.c
b/runtime/signals_byt.c
+@@ -81,4 +81,4 @@ int caml_set_signal_action(int signo, int action)
+ return 0;
+ }
+
+-CAMLexport void caml_setup_stack_overflow_detection(void) {}
++CAMLexport int caml_setup_stack_overflow_detection(void) { return 0; }
+--- a/runtime/signals_nat.c
b/runtime/signals_nat.c
+@@ -181,8 +181,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
+ #error "CONTEXT_SP is required if HAS_STACK_OVERFLOW_DETECTION is defined"
+ #endif
+
+-static char sig_alt_stack[SIGSTKSZ];
+-
+ /* Code compiled with ocamlopt never accesses more than
+EXTRA_STACK bytes below the stack pointer. */
+ #define EXTRA_STACK 256
+@@ -276,28 +274,33 @@ void caml_init_signals(void)
+ #endif
+
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+- {
+-stack_t stk;
++ if (caml_setup_stack_overflow_detection() != -1) {
+ struct sigaction act;
+-stk.ss_sp = sig_alt_stack;
+-stk.ss_size = SIGSTKSZ;
+-stk.ss_flags = 0;
+ SET_SIGACT(act, segv_handler);
+ act.sa_flags |= SA_ONSTACK | SA_NODEFER;
+ sigemptyset(_mask);
+-if (sigaltstack(, NULL) == 0) { sigaction(SIGSEGV, , NULL); }
++sigaction(SIGSEGV, , NULL);
+ }
+ #endif
+ }
+
+-CAMLexport void caml_setup_stack_overflow_detection(void)
++/* Allocate and select an alternate stack for handling signals,
++ especially SIGSEGV signals.
++ Each thread needs its own alternate stack.
++ The alternate stack used to be statically-allocated for the main thread,
++ but this is incompatible with Glibc 2.34 and newer, where SIGSTKSZ
++ may not be a compile-time constant (issue #10250). */
++
++CAMLexport int caml_setup_stack_overflow_detection(void)
+ {
+ #ifdef HAS_STACK_OVERFLOW_DETECTION
+ stack_t stk;
+ stk.ss_sp = malloc(SIGSTKSZ);
++ if (stk.ss_sp == NULL) return -1;
+ stk.ss_size = SIGSTKSZ;
+ stk.ss_flags = 0;
+- if (stk.ss_sp)
+-sigaltstack(, NULL);
++ return sigaltstack(, NULL);
++#else
++ return 0;
+ #endif
+ }
diff --git a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
index da99522c6e3..287a7f38e79 100644
--- a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
@@ -20,6 +20,10 @@ BDEPEND="${RDEPEND}
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.12.0-glibc-2.34.patch
+)
+
src_prepare() {
default
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild
b/dev-lang/ocaml/ocaml-4.12.1.ebuild
index da99522c6e3..287a7f38e79 100644
--- a/dev-lang/ocaml/ocaml-4.12.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -20,6
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 58826bf139fe470b0fb7fb8e5f3491c0af1d5f0f
Author: Sam James gentoo org>
AuthorDate: Sat Oct 9 05:54:50 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 9 05:55:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58826bf1
dev-lang/ocaml: drop 4.12.0-r2, 4.13.0
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest | 2 -
dev-lang/ocaml/ocaml-4.12.0-r2.ebuild | 101 --
dev-lang/ocaml/ocaml-4.13.0.ebuild| 97
3 files changed, 200 deletions(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index c7ab1b62945..eda27fba03d 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,8 +2,6 @@ DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B
c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe
DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd
SHA512
dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528
SHA512
1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06
SHA512
03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
-DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B
318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208
SHA512
951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f
SHA512
e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
-DIST ocaml-4.13.0.tar.gz 5323007 BLAKE2B
56cbb64272ac2b4b8894b3bb91ec184eb977cb056ae75ace2fce716fdb9853d5626b8f91dcc339d1d0f9f033f032f99bc6e49c443ee142f6005aaabeef9a670a
SHA512
553c94ba5c5332d134f2695b3323e4be60ef2d0a404652cbcc56968ec91b1de19a6d894c6e365e418fe814595bb926450d7b109e328e25fc317f13ed6b703080
DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B
f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae
SHA512
da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
deleted file mode 100644
index 287a7f38e79..000
--- a/dev-lang/ocaml/ocaml-4.12.0-r2.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-HOMEPAGE="https://ocaml.org/;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
-
-LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex +ocamlopt xemacs"
-
-RDEPEND="sys-libs/binutils-libs:="
-BDEPEND="${RDEPEND}
- virtual/pkgconfig"
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
- xemacs? ( app-xemacs/ocaml )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-4.12.0-glibc-2.34.patch
-)
-
-src_prepare() {
- default
-
- cp "${FILESDIR}"/ocaml.conf "${T}" || die
-
- # OCaml generates textrels on 32-bit arches
- # We can't do anything about it, but disabling it means that tests
- # for OCaml-based packages won't fail on unexpected output
- # bug #773226
- if use arm || use ppc || use x86 ; then
- append-ldflags "-Wl,-z,notext"
- fi
-
- # Upstream build ignores LDFLAGS in several places.
- sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
- -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
- -e
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 4b4d33fb725f7d295dd54f82966aabee7eb02fb9
Author: Sam James gentoo org>
AuthorDate: Thu Oct 7 06:35:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Oct 7 06:36:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b4d33fb
dev-lang/ocaml: add 4.13.1
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.13.1.ebuild | 97 ++
2 files changed, 98 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index a9db051fa41..c7ab1b62945 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -5,4 +5,5 @@ DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e
DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B
318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208
SHA512
951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f
SHA512
e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
DIST ocaml-4.13.0.tar.gz 5323007 BLAKE2B
56cbb64272ac2b4b8894b3bb91ec184eb977cb056ae75ace2fce716fdb9853d5626b8f91dcc339d1d0f9f033f032f99bc6e49c443ee142f6005aaabeef9a670a
SHA512
553c94ba5c5332d134f2695b3323e4be60ef2d0a404652cbcc56968ec91b1de19a6d894c6e365e418fe814595bb926450d7b109e328e25fc317f13ed6b703080
+DIST ocaml-4.13.1.tar.gz 5323203 BLAKE2B
f1dcb1601ebfa2a37351e3a466a7ca601518c2da403b01aeb182738a54d5887523ab554d747d6591cb09b07b417865e20907f7877117b2d2d069ef6c9edc0fae
SHA512
da3434177438c852da53c0fda7bc2519adcda6384d97d45e44137ed0fd384ffb3da61958a7b51296edb3f88f5a5310ca71b6862f6d756aaa4012d1f54e5955f6
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.13.1.ebuild
b/dev-lang/ocaml/ocaml-4.13.1.ebuild
new file mode 100644
index 000..da99522c6e3
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.13.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt xemacs"
+
+RDEPEND="sys-libs/binutils-libs:="
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ )
+
+ econf "${opt[@]}"
+}
+
+src_compile() {
+ env -u P emake world
+
+ if use ocamlopt ; then
+ env -u P emake opt
+ env -u P emake opt.opt
+ fi
+}
+
+src_test() {
+ emake -j
+
+ # OCaml tests only work when run sequentially
+ if use ocamlopt ; then
+ emake -j1 ocamltest.opt
+ else
+ emake -j1 ocamltest
+ #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+
+ emake -j1 tests
+}
+
+src_install() {
+ default
+
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: f570bf2b0a65911fc4b9759e20f748cda8d00d17
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 05:09:09 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 05:09:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f570bf2b
dev-lang/ocaml: add 4.13.0
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.13.0.ebuild | 97 ++
2 files changed, 98 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 15b20c48f7d..a9db051fa41 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -4,4 +4,5 @@ DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06
SHA512
03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B
318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208
SHA512
951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f
SHA512
e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
+DIST ocaml-4.13.0.tar.gz 5323007 BLAKE2B
56cbb64272ac2b4b8894b3bb91ec184eb977cb056ae75ace2fce716fdb9853d5626b8f91dcc339d1d0f9f033f032f99bc6e49c443ee142f6005aaabeef9a670a
SHA512
553c94ba5c5332d134f2695b3323e4be60ef2d0a404652cbcc56968ec91b1de19a6d894c6e365e418fe814595bb926450d7b109e328e25fc317f13ed6b703080
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.13.0.ebuild
b/dev-lang/ocaml/ocaml-4.13.0.ebuild
new file mode 100644
index 000..da99522c6e3
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.13.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt xemacs"
+
+RDEPEND="sys-libs/binutils-libs:="
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ )
+
+ econf "${opt[@]}"
+}
+
+src_compile() {
+ env -u P emake world
+
+ if use ocamlopt ; then
+ env -u P emake opt
+ env -u P emake opt.opt
+ fi
+}
+
+src_test() {
+ emake -j
+
+ # OCaml tests only work when run sequentially
+ if use ocamlopt ; then
+ emake -j1 ocamltest.opt
+ else
+ emake -j1 ocamltest
+ #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+
+ emake -j1 tests
+}
+
+src_install() {
+ default
+
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 92502dc872b783f7f22a8a8b608baefc5dccb611
Author: Sam James gentoo org>
AuthorDate: Sat Oct 2 04:57:02 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Oct 2 04:57:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92502dc8
dev-lang/ocaml: add 4.12.1
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.12.1.ebuild | 97 ++
2 files changed, 98 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 664a32bf678..15b20c48f7d 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -3,4 +3,5 @@ DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cf
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528
SHA512
1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06
SHA512
03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B
318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208
SHA512
951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
+DIST ocaml-4.12.1.tar.gz 5181696 BLAKE2B
9d21438e09b1a9680eabb65f5c78d9fe84459592ef7bb797a1933e5383f7b6d5cefffa8cdc184abc102417f5dbc0fca8ef624c9b560f89eaff6537544b5b395f
SHA512
e942e5cf5530804690ec45c40936ad2acbb60e11279fc676e0f04181fe1855f84ee5c3cb9c337fc5d01f6ee0e7b2251a6c04f7de56d99c20bb62026dff6c5671
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.12.1.ebuild
b/dev-lang/ocaml/ocaml-4.12.1.ebuild
new file mode 100644
index 000..da99522c6e3
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.12.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt xemacs"
+
+RDEPEND="sys-libs/binutils-libs:="
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ )
+
+ econf "${opt[@]}"
+}
+
+src_compile() {
+ env -u P emake world
+
+ if use ocamlopt ; then
+ env -u P emake opt
+ env -u P emake opt.opt
+ fi
+}
+
+src_test() {
+ emake -j
+
+ # OCaml tests only work when run sequentially
+ if use ocamlopt ; then
+ emake -j1 ocamltest.opt
+ else
+ emake -j1 ocamltest
+ #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+
+ emake -j1 tests
+}
+
+src_install() {
+ default
+
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: b2190b3fac9d3cad611c9587342fa64359e2c4db
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Sep 15 19:41:49 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Sep 15 19:41:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2190b3f
dev-lang/ocaml: UnusedInherits
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r7.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.05.0-r8.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
index ebd032a4fd8..7604e5ba353 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
PATCHLEVEL="9"
MY_P="${P/_/-}"
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
index 11c811147b4..aab387a1042 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic toolchain-funcs
PATCHLEVEL="9"
MY_P="${P/_/-}"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 32961e61fdd8aef2d28e533c01ca81d90140f7ff
Author: Sam James gentoo org>
AuthorDate: Fri Jun 18 20:54:19 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Jun 18 21:08:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32961e61
dev-lang/ocaml: fix installed Portage set libdir target
Closes: https://bugs.gentoo.org/796641
Signed-off-by: Sam James gentoo.org>
.../{ocaml-4.05.0-r5.ebuild => ocaml-4.05.0-r7.ebuild}| 10 --
.../{ocaml-4.05.0-r6.ebuild => ocaml-4.05.0-r8.ebuild}| 12 +---
.../{ocaml-4.09.0-r1.ebuild => ocaml-4.09.0-r2.ebuild}| 11 ---
.../{ocaml-4.10.2-r1.ebuild => ocaml-4.10.2-r2.ebuild}| 10 +++---
.../{ocaml-4.11.2-r1.ebuild => ocaml-4.11.2-r2.ebuild}| 15 ++-
.../{ocaml-4.12.0-r1.ebuild => ocaml-4.12.0-r2.ebuild}| 14 +-
6 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
similarity index 96%
rename from dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
index 36adb282101..ebd032a4fd8 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r7.ebuild
@@ -50,6 +50,9 @@ pkg_setup() {
src_prepare() {
EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
default
}
@@ -133,10 +136,13 @@ src_install() {
dodoc Changes README.adoc
# Create envd entry for latex input files
if use latex ; then
- echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+ echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" >
"${T}"/99ocamldoc || die
doenvd "${T}/99ocamldoc"
fi
+
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
# Install ocaml-rebuild portage set
insinto /usr/share/portage/config/sets
- doins "${FILESDIR}/ocaml.conf"
+ doins "${T}"/ocaml.conf
}
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
similarity index 95%
rename from dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
index ae3120cad72..11c811147b4 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r8.ebuild
@@ -51,6 +51,9 @@ pkg_setup() {
src_prepare() {
EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
+
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
default
}
@@ -134,10 +137,13 @@ src_install() {
dodoc Changes README.adoc
# Create envd entry for latex input files
if use latex ; then
- echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
- doenvd "${T}/99ocamldoc"
+ echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" >
"${T}"/99ocamldoc || die
+ doenvd "${T}"/99ocamldoc
fi
+
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
# Install ocaml-rebuild portage set
insinto /usr/share/portage/config/sets
- doins "${FILESDIR}/ocaml.conf"
+ doins "${T}"/ocaml.conf
}
diff --git a/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
similarity index 92%
rename from dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
rename to dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
index 14dc7a908b0..23d27276013 100644
--- a/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r2.ebuild
@@ -26,6 +26,8 @@ PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
src_prepare() {
default
+ cp "${FILESDIR}"/ocaml.conf "${T}" || die
+
# OCaml generates textrels on 32-bit arches
# We can't do anything about it, but disabling it means that tests
# for OCaml-based packages won't fail on unexpected output
@@ -80,10 +82,13 @@ src_install() {
dodoc Changes README.adoc
# Create envd entry for latex input files
if use latex ; then
- echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
- doenvd "${T}/99ocamldoc"
+ echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" >
"${T}"/99ocamldoc || die
+ doenvd "${T}"/99ocamldoc
fi
+
+ sed -i -e "s:lib:$(get_libdir):" "${T}"/ocaml.conf || die
+
# Install ocaml-rebuild portage set
insinto /usr/share/portage/config/sets
- doins "${FILESDIR}/ocaml.conf"
+ doins "${T}"/ocaml.conf
}
diff --git a/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
similarity index 92%
rename from dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
rename to dev-lang/ocaml/ocaml-4.10.2-r2.ebuild
index e1ca18aa961..7203dec65d6 100644
--- a/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
+++
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 2e76cc8b33f566bab28fad6f4efba99b18c03631
Author: Sam James gentoo org>
AuthorDate: Wed Jun 9 21:38:36 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jun 9 21:38:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e76cc8b
dev-lang/ocaml: adjust subslot to be major version
Should be bytecode compatible with non-major version changes. Makes it
a lot easier to give dependencies in e.g. camlp4 which needs to be
exactly aligned with the OCaml major version.
Bug: https://bugs.gentoo.org/794898
Acked-by: Alfredo Tupone gentoo.org>
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/{ocaml-4.05.0-r3.ebuild => ocaml-4.05.0-r5.ebuild} | 2 +-
dev-lang/ocaml/{ocaml-4.05.0-r4.ebuild => ocaml-4.05.0-r6.ebuild} | 2 +-
dev-lang/ocaml/{ocaml-4.09.0.ebuild => ocaml-4.09.0-r1.ebuild}| 2 +-
dev-lang/ocaml/{ocaml-4.10.2.ebuild => ocaml-4.10.2-r1.ebuild}| 2 +-
dev-lang/ocaml/{ocaml-4.11.2.ebuild => ocaml-4.11.2-r1.ebuild}| 2 +-
dev-lang/ocaml/{ocaml-4.12.0.ebuild => ocaml-4.12.0-r1.ebuild}| 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
index 69094b6cb10..36adb282101 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r5.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.
LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
index 1fd3049eff5..ae3120cad72 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r6.ebuild
@@ -15,7 +15,7 @@
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz -> ${MY_P}.tar.
LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.09.0.ebuild
rename to dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
index f74988668b8..14dc7a908b0 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.10.2.ebuild
b/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
similarity index 99%
rename from dev-lang/ocaml/ocaml-4.10.2.ebuild
rename to dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
index 208d8612d6a..e1ca18aa961 100644
--- a/dev-lang/ocaml/ocaml-4.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
diff --git a/dev-lang/ocaml/ocaml-4.11.2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
similarity index 98%
rename from dev-lang/ocaml/ocaml-4.11.2.ebuild
rename to dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
index e3298bdfc89..f1ad43dbf99 100644
--- a/dev-lang/ocaml/ocaml-4.11.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.2-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz
-> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
LICENSE="QPL-1.0 LGPL-2"
-SLOT="0/${PV}"
+SLOT="0/$(ver_cut 1-2)"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: 34b06d35218d9e444050526511da10962ea72c2f
Author: Sam James gentoo org>
AuthorDate: Tue Jun 8 04:58:53 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 8 04:59:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34b06d35
dev-lang/ocaml: add CVE-2018-9838 patch to 4.05.0
Closes: https://bugs.gentoo.org/755257
Bug: https://bugs.gentoo.org/719134
Signed-off-by: Sam James gentoo.org>
.../ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch | 70 ++
dev-lang/ocaml/ocaml-4.05.0-r4.ebuild | 143 +
2 files changed, 213 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
b/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
new file mode 100644
index 000..cfe3ff636c2
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-CVE-2018-9838.patch
@@ -0,0 +1,70 @@
+https://bugs.gentoo.org/755257
+
+Needed for both fixing the CVE + compatibility with Debian for e.g.
+Unison.
+
+From c6ca3afc78b75d7748e4e09e56c6b020418be06e Mon Sep 17 00:00:00 2001
+From: Stephane Glondu
+Date: Fri, 25 Jan 2019 14:34:23 +0100
+Subject: [PATCH] Fix integer overflows when unmarshaling a bigarray
+
+Malicious or corrupted marshaled data can result in a bigarray
+with impossibly large dimensions that cause overflow when computing
+the in-memory size of the bigarray. Disaster ensues when the data
+is read in a too small memory area. This commit checks for overflows
+when computing the in-memory size of the bigarray.
+
+This patch is based on one by Xavier Leroy and has been modified to
+use caml_ba_multov instead of caml_umul_overflow which is unavailable
+in OCaml 4.05.0.
+
+The original commit hash is 85162eee9d4072fa9c2f498f03cd94e357033eec.
+
+Origin: https://github.com/ocaml/ocaml/pull/1718
+Bug: https://github.com/ocaml/ocaml/issues/7765
+Bug-Debian: https://bugs.debian.org/895472
+Bug-CVE: CVE-2018-9838
+--- a/otherlibs/bigarray/bigarray_stubs.c
b/otherlibs/bigarray/bigarray_stubs.c
+@@ -966,22 +966,34 @@ static void caml_ba_deserialize_longarray(void * dest,
intnat num_elts)
+ uintnat caml_ba_deserialize(void * dst)
+ {
+ struct caml_ba_array * b = dst;
+- int i, elt_size;
+- uintnat num_elts;
++ int i;
++ uintnat num_elts, size;
++ int overflow;
+
+ /* Read back header information */
+ b->num_dims = caml_deserialize_uint_4();
++ if (b->num_dims < 0 || b->num_dims > CAML_BA_MAX_NUM_DIMS)
++caml_deserialize_error("input_value: wrong number of bigarray
dimensions");
+ b->flags = caml_deserialize_uint_4() | CAML_BA_MANAGED;
+ b->proxy = NULL;
+ for (i = 0; i < b->num_dims; i++) b->dim[i] = caml_deserialize_uint_4();
+- /* Compute total number of elements */
+- num_elts = caml_ba_num_elts(b);
+- /* Determine element size in bytes */
++ /* Compute total number of elements. Watch out for overflows (MPR#7765). */
++ num_elts = 1;
++ for (i = 0; i < b->num_dims; i++) {
++overflow = 0;
++num_elts = caml_ba_multov(num_elts, b->dim[i], );
++if (overflow)
++ caml_deserialize_error("input_value: size overflow for bigarray");
++ }
++ /* Determine array size in bytes. Watch out for overflows (MPR#7765). */
+ if ((b->flags & CAML_BA_KIND_MASK) > CAML_BA_CHAR)
+ caml_deserialize_error("input_value: bad bigarray kind");
+- elt_size = caml_ba_element_size[b->flags & CAML_BA_KIND_MASK];
++ overflow = 0;
++ size = caml_ba_multov(num_elts, caml_ba_element_size[b->flags &
CAML_BA_KIND_MASK], );
++ if (overflow)
++caml_deserialize_error("input_value: size overflow for bigarray");
+ /* Allocate room for data */
+- b->data = malloc(elt_size * num_elts);
++ b->data = malloc(size);
+ if (b->data == NULL)
+ caml_deserialize_error("input_value: out of memory for bigarray");
+ /* Read data */
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
new file mode 100644
index 000..1fd3049eff5
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.05.0-r4.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib toolchain-funcs
+
+PATCHLEVEL="9"
+MY_P="${P/_/-}"
+DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
+HOMEPAGE="https://ocaml.org;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
+
+RDEPEND="
+ sys-libs/binutils-libs:=
+ ncurses? ( sys-libs/ncurses:0= )
+ spacetime? (
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 9fbaba04084e9fb5a7f7c29f989c03525c0bed47
Author: Sam James gentoo org>
AuthorDate: Tue Jun 8 04:49:29 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 8 04:59:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fbaba04
dev-lang/ocaml: add 4.12.0
Closes: https://bugs.gentoo.org/772407
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.12.0.ebuild | 93 ++
2 files changed, 94 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index e2259b4a03d..664a32bf678 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,4 +2,5 @@ DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B
c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe
DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd
SHA512
dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528
SHA512
1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06
SHA512
03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
+DIST ocaml-4.12.0.tar.gz 5179734 BLAKE2B
318be7e306157102d7ad22802db381dfa9c675e43325395695c3564e5ffee87d9b55d1152ea1603edb5ef715a28cbde85d835dbf1b5aface2dc415c67192c208
SHA512
951e44cdda613f9c6c5f988434c84249a2d63ba14e21938a9e74c174ebaf9d81a3160d1e5021d57fcd4882732ae6aefc05239ac38116f39ca83d53879d5d4eaf
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.12.0.ebuild
b/dev-lang/ocaml/ocaml-4.12.0.ebuild
new file mode 100644
index 000..b045e3d1153
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.12.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt xemacs"
+
+RDEPEND="sys-libs/binutils-libs:="
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ #if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ #fi
+
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ )
+
+ econf "${opt[@]}"
+}
+
+src_compile() {
+ env -u P emake world
+
+ if use ocamlopt ; then
+ env -u P emake opt
+ env -u P emake opt.opt
+ fi
+}
+
+src_test() {
+ emake -j
+
+ # OCaml tests only work when run sequentially
+ if use ocamlopt ; then
+ emake -j1 ocamltest.opt
+ else
+ emake -j1 ocamltest
+ #ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+
+ emake -j1 tests
+}
+
+src_install() {
+ default
+
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+ dodoc Changes
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 4bbb6a45f6d3e0193703828d6cdf04b46babc7b9
Author: Sam James gentoo org>
AuthorDate: Fri Mar 12 18:13:26 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Mar 12 18:22:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bbb6a45
dev-lang/ocaml: don't warn on textrels on 32-bit arches
We can't do anything about it on 32-bit arches and it causes
unnecessary test failures in OCaml-based packages
(because of the diff in output).
Closes: https://bugs.gentoo.org/773226
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r3.ebuild | 8
dev-lang/ocaml/ocaml-4.09.0.ebuild| 11 +++
dev-lang/ocaml/ocaml-4.10.0.ebuild| 11 +++
dev-lang/ocaml/ocaml-4.10.2.ebuild| 11 +++
dev-lang/ocaml/ocaml-4.11.1.ebuild| 11 +++
dev-lang/ocaml/ocaml-4.11.2.ebuild| 11 +++
6 files changed, 63 insertions(+)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
index c05a2cadaf4..69094b6cb10 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
@@ -66,6 +66,14 @@ src_configure() {
# -ggdb3 & co makes it behave weirdly, breaks sexplib
replace-flags -ggdb* -ggdb
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
# It doesn't compile on alpha without this LDFLAGS
use alpha && append-ldflags "-Wl,--no-relax"
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 181f30b8fef..f74988668b8 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
@@ -23,6 +25,15 @@ PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
src_prepare() {
default
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
# Upstream build ignores LDFLAGS in several places.
sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
diff --git a/dev-lang/ocaml/ocaml-4.10.0.ebuild
b/dev-lang/ocaml/ocaml-4.10.0.ebuild
index 903534e88c8..a91786e0301 100644
--- a/dev-lang/ocaml/ocaml-4.10.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.0.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
@@ -23,6 +25,15 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
src_prepare() {
default
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
# Upstream build ignores LDFLAGS in several places.
sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
diff --git a/dev-lang/ocaml/ocaml-4.10.2.ebuild
b/dev-lang/ocaml/ocaml-4.10.2.ebuild
index f29e4ae7220..208d8612d6a 100644
--- a/dev-lang/ocaml/ocaml-4.10.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.10.2.ebuild
@@ -3,6 +3,8 @@
EAPI=7
+inherit flag-o-matic
+
HOMEPAGE="https://ocaml.org/;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
@@ -21,6 +23,15 @@ PDEPEND="emacs? ( app-emacs/ocaml-mode )
src_prepare() {
default
+
+ # OCaml generates textrels on 32-bit arches
+ # We can't do anything about it, but disabling it means that tests
+ # for OCaml-based packages won't fail on unexpected output
+ # bug #773226
+ if use arm || use ppc || use x86 ; then
+ append-ldflags "-Wl,-z,notext"
+ fi
+
# Upstream build ignores LDFLAGS in several places.
sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
-e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
diff --git a/dev-lang/ocaml/ocaml-4.11.1.ebuild
b/dev-lang/ocaml/ocaml-4.11.1.ebuild
index
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: da5e152c604dfeb14caf7adfa3db9c36d0f004e4
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Mar 8 14:45:02 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 8 15:09:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da5e152c
dev-lang/ocaml: fixing patching, remove unused eutils eclass
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://bugs.gentoo.org/774867
Closes: https://github.com/gentoo/gentoo/pull/19831
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r3.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
index ecf884d0ff1..c05a2cadaf4 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r3.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit flag-o-matic eutils multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs
PATCHLEVEL="9"
MY_P="${P/_/-}"
@@ -49,9 +49,8 @@ pkg_setup() {
}
src_prepare() {
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+ EPATCH_SUFFIX="patch" eapply "${WORKDIR}/patches"
default
-
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 7597801c23580d07a3a8d7c7a0ba15fec5492586
Author: Sam James gentoo org>
AuthorDate: Wed Feb 24 16:15:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Feb 24 16:21:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7597801c
dev-lang/ocaml: bump to 4.11.2
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.11.2.ebuild | 74 ++
2 files changed, 75 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 1279d88ed3c..bb30f38906e 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -3,4 +3,5 @@ DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cf
DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B
71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d
SHA512
f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528
SHA512
1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B
a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4
SHA512
93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
+DIST ocaml-4.11.2.tar.gz 5075323 BLAKE2B
bdc503d9a8d0e39dd11060febcd0287657b460e50ed81e55578a3e778af990ca5d4ef9011753eee4e1a144da33eb76c95b1672dc99b76e65a2e107eee472fe06
SHA512
03d8a9f6e130142c121ff2eb3d54f584f1e7c8475f066a5803bb0edd2fa172ca06a56a3ec548b225f5c8b12112d7a68511b1e16f3ade075b5f02610d4247bbb3
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.11.2.ebuild
b/dev-lang/ocaml/ocaml-4.11.2.ebuild
new file mode 100644
index 000..280d813184b
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.11.2.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="QPL-1.0 LGPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+ spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ $(use_enable spacetime)
+ )
+ econf ${opt[@]}
+}
+
+src_compile() {
+ if use ocamlopt ; then
+ env -u P emake world.opt
+ else
+ env -u P emake world
+ fi
+}
+
+src_test() {
+ if use ocamlopt ; then
+ # OCaml tests only work when run sequentially
+ emake -j1 tests
+ else
+ ewarn "${PN} was built without 'ocamlopt' USE flag; skipping
tests."
+ fi
+}
+
+src_install() {
+ default
+ dodir /usr/include
+ # Create symlink for header files
+ dosym "../$(get_libdir)/ocaml/caml" /usr/include/caml
+ dodoc Changes README.adoc
+ # Create envd entry for latex input files
+ if use latex ; then
+ echo
"TEXINPUTS=\"${EPREFIX}/usr/$(get_libdir)/ocaml/ocamldoc:\"" > "${T}/99ocamldoc"
+ doenvd "${T}/99ocamldoc"
+ fi
+ # Install ocaml-rebuild portage set
+ insinto /usr/share/portage/config/sets
+ doins
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: b953f1809107eabb42a356839cba543e699c84aa
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 17 18:04:17 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 17 18:04:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b953f180
dev-lang/ocaml: remove 4.04 version
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/Manifest | 2 -
dev-lang/ocaml/ocaml-4.04.2-r1.ebuild | 128 --
2 files changed, 130 deletions(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 84240dde1f1..1279d88ed3c 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,8 +1,6 @@
-DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B
756936592c7e0c87da27f154f07850eb3e4b2ed46ff3b36ff57541375840cd56b170dbe646ef6682f63d4e15ae209d3c125581803641f07403e9eb838c265519
SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B
c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc
SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd
SHA512
dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B
71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d
SHA512
f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528
SHA512
1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B
a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4
SHA512
93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
-DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B
5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb
SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
deleted file mode 100644
index 72014ebdabd..000
--- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="8"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="https://ocaml.org;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux
~x86-linux"
-IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
-
-RDEPEND="
- sys-libs/binutils-libs:=
- ncurses? ( sys-libs/ncurses:0= )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
- xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
- # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
- # results in relocations if gcc wants to create a PIE executable
- if gcc-specs-pie ; then
- append-ldflags -nopie
- ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
- ewarn "We have appended -nopie to ocaml build options"
- ewarn "because linking an
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: a3e8774a6625fae44f96745e0f5c42bf39b96940
Author: Alfredo Tupone gentoo org>
AuthorDate: Wed Feb 17 06:58:06 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Wed Feb 17 06:58:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e8774a
dev-lang/ocaml: migrate to EAPI 7
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/ocaml-4.05.0-r1.ebuild | 130 -
...aml-4.05.0-r2.ebuild => ocaml-4.05.0-r3.ebuild} | 31 ++---
2 files changed, 17 insertions(+), 144 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
deleted file mode 100644
index f1e64c43cda..000
--- a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="9"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="https://ocaml.org;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
-
-RDEPEND="
- sys-libs/binutils-libs:=
- ncurses? ( sys-libs/ncurses:0= )
- spacetime? ( sys-libs/libunwind:= )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
- xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
- # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
- # results in relocations if gcc wants to create a PIE executable
- if gcc-specs-pie ; then
- append-ldflags -nopie
- ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
- ewarn "We have appended -nopie to ocaml build options"
- ewarn "because linking an executable with pie while the objects
are not pic will not work"
- fi
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
- epatch "${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512
-}
-
-src_configure() {
- export LC_ALL=C
- local myconf=""
-
- # Causes build failures because it builds some programs with -pg,
- # bug #270920
- filter-flags -fomit-frame-pointer
- # Bug #285993
- filter-mfpmath sse
-
- # -ggdb3 & co makes it behave weirdly, breaks sexplib
- replace-flags -ggdb* -ggdb
-
- # It doesn't compile on alpha without this LDFLAGS
- use alpha && append-ldflags "-Wl,--no-relax"
-
- use ncurses || myconf="${myconf} -no-curses"
- use X || myconf="${myconf} -no-graph"
- use flambda && myconf="${myconf} -flambda"
- use spacetime && myconf="${myconf} -spacetime"
-
- # ocaml uses a home-brewn configure script, preventing it to use econf.
- RAW_LDFLAGS="$(raw-ldflags)" ./configure \
- --prefix "${EPREFIX}"/usr \
- --bindir "${EPREFIX}"/usr/bin \
- --target-bindir "${EPREFIX}"/usr/bin \
- --libdir "${EPREFIX}"/usr/$(get_libdir)/ocaml \
- --mandir "${EPREFIX}"/usr/share/man \
- -target "${CHOST}" \
- -host "${CBUILD}" \
- -cc "$(tc-getCC)" \
- -as "$(tc-getAS)" \
- -aspp "$(tc-getCC) -c" \
- -partialld "$(tc-getLD) -r" \
- --with-pthread ${myconf} || die "configure failed!"
-
- # http://caml.inria.fr/mantis/view.php?id=4698
- export CCLINKFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
- emake world
-
- # Native code generation can be disabled now
- if use ocamlopt ; then
- # bug #279968
- emake opt
- emake -j1 opt.opt
- fi
-}
-
-src_test() {
- if use ocamlopt ; then
- emake -j1 tests
- else
- ewarn "${PN} testsuite requires ocamlopt useflag"
- fi
-}
-
-src_install() {
- emake BINDIR="${ED}"/usr/bin \
- LIBDIR="${ED}"/usr/$(get_libdir)/ocaml \
- MANDIR="${ED}"/usr/share/man \
- install
-
- # Symlink the headers to the right place
- dodir /usr/include
- dosym /usr/$(get_libdir)/ocaml/caml /usr/include/caml
-
- dodoc Changes README.adoc
-
- # Create and envd entry for latex input files
- if use
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/, dev-lang/ocaml/files/
commit: 77fd8a0f1e7d400c8658105c0e0163ac49b6412b
Author: Alfredo Tupone gentoo org>
AuthorDate: Thu Jan 28 22:15:08 2021 +
Commit: Alfredo Tupone gentoo org>
CommitDate: Thu Jan 28 22:15:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77fd8a0f
dev-lang/ocaml: build with gcc-10
Bug: https://bugs.gentoo.org/735274
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Alfredo Tupone gentoo.org>
dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch | 59
dev-lang/ocaml/ocaml-4.05.0-r2.ebuild | 132 ++
2 files changed, 191 insertions(+)
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
new file mode 100644
index 000..a0c67da534a
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
@@ -0,0 +1,59 @@
+--- a/byterun/caml/intext.h2021-01-28 22:46:20.400224678 +0100
b/byterun/caml/intext.h2021-01-28 22:46:49.312751054 +0100
+@@ -196,7 +196,7 @@
+
+ CAMLextern struct code_fragment * caml_extern_find_code(char *addr);
+
+-struct ext_table caml_code_fragments_table;
++extern struct ext_table caml_code_fragments_table;
+
+ #endif /* CAML_INTERNALS */
+
+--- a/byterun/caml/major_gc.h 2021-01-28 22:44:12.193323457 +0100
b/byterun/caml/major_gc.h 2021-01-28 22:45:20.918198701 +0100
+@@ -64,9 +64,9 @@
+ extern char *caml_gc_sweep_hp;
+
+ extern int caml_major_window;
+-double caml_major_ring[Max_major_window];
+-int caml_major_ring_index;
+-double caml_major_work_credit;
++extern double caml_major_ring[Max_major_window];
++extern int caml_major_ring_index;
++extern double caml_major_work_credit;
+ extern double caml_gc_clock;
+
+ /* [caml_major_gc_hook] is called just between the end of the mark
+--- a/byterun/meta.c 2021-01-28 22:47:34.148016359 +0100
b/byterun/meta.c 2021-01-28 22:47:56.048657393 +0100
+@@ -32,6 +32,8 @@
+ #include "caml/prims.h"
+ #include "caml/stacks.h"
+
++struct ext_table caml_code_fragments_table;
++
+ #ifndef NATIVE_CODE
+
+ CAMLprim value caml_get_global_data(value unit)
+--- a/byterun/backtrace.c 2021-01-28 22:50:25.275226598 +0100
b/byterun/backtrace.c 2021-01-28 22:50:37.541027290 +0100
+@@ -28,7 +28,7 @@
+ #include "caml/fail.h"
+
+ /* The table of debug information fragments */
+-struct ext_table caml_debug_info;
++extern struct ext_table caml_debug_info;
+
+ CAMLexport int32_t caml_backtrace_active = 0;
+ CAMLexport int32_t caml_backtrace_pos = 0;
+--- a/asmrun/startup.c 2021-01-28 23:02:50.526072662 +0100
b/asmrun/startup.c 2021-01-28 23:03:09.977754311 +0100
+@@ -44,7 +44,7 @@
+ #endif
+
+ extern int caml_parser_trace;
+-CAMLexport header_t caml_atom_table[256];
++CAMLextern header_t caml_atom_table[256];
+ char * caml_code_area_start, * caml_code_area_end;
+
+ /* Initialize the atom table and the static data and code area limits. */
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r2.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r2.ebuild
new file mode 100644
index 000..dc6ca02c535
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.05.0-r2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="9"
+MY_P="${P/_/-}"
+DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
+HOMEPAGE="https://ocaml.org;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
+
+RDEPEND="
+ sys-libs/binutils-libs:=
+ ncurses? ( sys-libs/ncurses:0= )
+ spacetime? ( sys-libs/libunwind:= )
+ X? ( x11-libs/libX11 )
+ !dev-ml/num"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
+ # results in relocations if gcc wants to create a PIE executable
+ if gcc-specs-pie ; then
+ append-ldflags -nopie
+ ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
+ ewarn "We have appended -nopie to ocaml build options"
+ ewarn "because linking an executable with pie while the objects
are not pic will not work"
+ fi
+}
+
+src_prepare() {
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+ epatch
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 439c7cfbbccf799365b39163c52e2d46cb2de51a Author: Sam James gentoo org> AuthorDate: Sun Jan 17 17:33:44 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 17 17:33:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=439c7cfb dev-lang/ocaml: adopt for ml@ Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-lang/ocaml/metadata.xml | 4 1 file changed, 4 insertions(+) diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml index 1b869c8a3d9..d0ecd9cc929 100644 --- a/dev-lang/ocaml/metadata.xml +++ b/dev-lang/ocaml/metadata.xml @@ -1,6 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> + + m...@gentoo.org + ML + gie...@gentoo.org Mark Wright
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: fb7b2e1ba02735cc72b20eae7bee9c119c66
Author: Sam James gentoo org>
AuthorDate: Mon Dec 28 09:20:07 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 28 09:23:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7b2eee
dev-lang/ocaml: bump to 4.10.2
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.10.2.ebuild | 79 ++
2 files changed, 80 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index bdcf6a4915f..84240dde1f1 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,6 +2,7 @@ DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B
756936592c7e0c87da27f154f07850eb3e4b2ed
DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B
c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc
SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd
SHA512
dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
DIST ocaml-4.10.0.tar.gz 4927867 BLAKE2B
71b8448a10bf3049e3b005dfbb2030d479e69e4c2ef00055f1dacd38eff838b0a5c18b4883d899b5eb4cbd05bb7ca35867010794ed25682ad51b2fe19ef2114d
SHA512
f39269d572b3f7755f7881b7a9fdfe5253e49d847835ae2a8695f67e3309fc1e925523d66ecbe1fb8bc0cc3b5602e077ce7feac4926aab571383766442265179
+DIST ocaml-4.10.2.tar.gz 4933135 BLAKE2B
ec5e92adb23c28a254247182c79ab555fd82603e02f24799049b8057abf869d18234302408c8ae89b9997a2b210ed6965e45c2c03e4f0cab34262ad3f6ebb528
SHA512
1dd827da07f01e815fd74dd7ee84db0900f24782f8f7fd426e2d71b9fb03c7b8045f22e018120a0446c362315751365d1bd8c1724edef2b182394e76eb0a07b2
DIST ocaml-4.11.1.tar.gz 5069552 BLAKE2B
a731d4b60d7965c860dda5c9dfb26b968320760501ff3cac908b8cd96e34391c417e16077cdf753b27b85a79857451e6ff0b566a9158178026a0e6bd5240aac4
SHA512
93fa8b2ff71d5f645e3ed72913205e7d35aa523cfa87d1939d77e796495b94c2fdb4a429ea65330cdeecfb0a36f7ab053b15090d9baa151b58e5331148dc8150
DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B
5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb
SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.10.2.ebuild
b/dev-lang/ocaml/ocaml-4.10.2.ebuild
new file mode 100644
index 000..509cb5812df
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.10.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+ spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+ # ${P} overrides upstream build's own P due to a wrong assignment
operator.
+ sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ $(use_enable spacetime)
+ )
+ econf ${opt[@]}
+}
+
+src_compile() {
+ if use ocamlopt ; then
+ emake world.opt
+ else
+ emake world
+ fi
+}
+
+src_test() {
+ if use
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: c01775e41dd1d1c46773d629daa95ddc7d99701e
Author: Mart Raudsepp gentoo org>
AuthorDate: Sun Apr 12 21:49:49 2020 +
Commit: Mart Raudsepp gentoo org>
CommitDate: Sun Apr 12 21:52:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c01775e4
dev-lang/ocaml: arm64 stable (bug #708696)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 1a0af05410e..e0b47a99781 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: c0ea2cbaac2b22626586af84954fa55c76c46e51
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Fri Mar 20 07:36:35 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Mar 20 08:07:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ea2cba
dev-lang/ocaml: drop to ~hppa
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-lang/ocaml/ocaml-4.04.2-r1.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.09.0.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
index fe83e8fbb86..7dff8d1830c 100644
--- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-linux ~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index d1296e74745..35498129665 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: d7e38cea28b03ab9fff237d46ae52cbc59b0bea3
Author: Sergei Trofimovich gentoo org>
AuthorDate: Mon Mar 2 11:36:55 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Mon Mar 2 11:36:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7e38cea
dev-lang/ocaml: stable 4.09.0 for hppa, bug #708696
Package-Manager: Portage-2.3.88, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 35498129665..d1296e74745 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 5c063e167b7751a3a8fdf4f90c0744ab07cab0b4
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Feb 11 12:14:58 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Feb 11 12:14:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c063e16
dev-lang/ocaml: ppc stable wrt bug #708696
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 7b5adb0b929..35498129665 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 3e48796eaf69f8db9a27ee5568b55282482df16b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Feb 11 11:44:08 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Feb 11 11:44:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e48796e
dev-lang/ocaml: ppc64 stable wrt bug #708696
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 56dcefbc139..7b5adb0b929 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: fda02c0cb61f574b4ef21d36c0bd32588910da85
Author: Agostino Sarubbo gentoo org>
AuthorDate: Tue Feb 11 11:36:33 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Tue Feb 11 11:36:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fda02c0c
dev-lang/ocaml: ia64 stable wrt bug #708696
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 04659b73364..56dcefbc139 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: a365ffee8a3dd63b2987bbdaac3ddda356a7a1e0
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Feb 10 08:18:00 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Feb 10 08:18:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a365ffee
dev-lang/ocaml: x86 stable wrt bug #708696
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 350c977a7d2..04659b73364 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 3c20c62a9be0e4aa45b380d4f132e56e26480f30
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Feb 10 08:16:50 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Feb 10 08:16:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c20c62a
dev-lang/ocaml: arm stable wrt bug #708696
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 89c9004502c..350c977a7d2 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 334c0b73cf9f60e1d103d9661a5a04f04051778f
Author: Agostino Sarubbo gentoo org>
AuthorDate: Sun Feb 9 10:31:36 2020 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Sun Feb 9 10:31:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=334c0b73
dev-lang/ocaml: amd64 stable wrt bug #708696
Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index 5fb59fc6617..89c9004502c 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: 3e396d2b57d76c1025491c8313859e59778f65e8
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Feb 5 09:38:23 2020 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Feb 5 09:38:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e396d2b
dev-lang/ocaml: tweak for gcc-10
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich gentoo.org>
dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch | 21 +
dev-lang/ocaml/ocaml-4.09.0.ebuild | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch
b/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch
new file mode 100644
index 000..e25d55a5f66
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/runtime/backtrace.c
b/runtime/backtrace.c
+@@ -28,7 +28,7 @@
+ #include "caml/fail.h"
+
+ /* The table of debug information fragments */
+-struct ext_table caml_debug_info;
++extern struct ext_table caml_debug_info;
+
+ CAMLexport int32_t caml_backtrace_active = 0;
+ CAMLexport int32_t caml_backtrace_pos = 0;
+--- a/runtime/startup_nat.c
b/runtime/startup_nat.c
+@@ -44,7 +44,6 @@
+ #endif
+
+ extern int caml_parser_trace;
+-CAMLexport header_t caml_atom_table[256];
+ char * caml_code_area_start, * caml_code_area_end;
+ struct ext_table caml_code_fragments_table;
+
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index c39cc2aee83..5fb59fc6617 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -19,6 +19,8 @@ BDEPEND="${RDEPEND}
PDEPEND="emacs? ( app-emacs/ocaml-mode )
xemacs? ( app-xemacs/ocaml )"
+PATCHES=("${FILESDIR}"/${PN}-4.09.0-gcc-10.patch)
+
src_prepare() {
default
# Upstream build ignores LDFLAGS in several places.
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 8f2b80ace6a8276b20b86bae4f38000490702d31
Author: Mikle Kolyada gentoo org>
AuthorDate: Sat Dec 28 13:39:29 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Sat Dec 28 13:39:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f2b80ac
dev-lang/ocaml: restore keywords
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Mikle Kolyada gentoo.org>
dev-lang/ocaml/ocaml-4.09.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
index feadd4f5804..c39cc2aee83 100644
--- a/dev-lang/ocaml/ocaml-4.09.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Programming language supporting functional,
imperative & object-ori
LICENSE="LGPL-2.1"
SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
RDEPEND="sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: df1434388cf449f432d8058f8fa0e9f0202483ab
Author: Ralph Seichter seichter de>
AuthorDate: Mon Dec 16 01:37:34 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Fri Dec 27 13:39:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df143438
dev-lang/ocaml: Bump to version 4.09.0, EAPI 7
This new OCaml ebuild uses EAPI 7. As discussed with Zlogenem, multi-
platform support has been removed and the ebuild is now keyworded for
~amd64 only.
Significant time was spent figuring out why the build failed when run
via ebuild, but succeeded when run manually. After I filed an upstream
issue[1] and a subsequent discussion, it turned out that Gentoo's ${P}
variable clashed with the OCaml build, as I had suspected. The line
P ?= stdlib__
in a Makefile resulted in wrong file paths which in turn broke the
OCaml documentation build. I have asked upstream if their use of the
"?=" operator is deliberate; an answer is pending.
The license in this build has been changed to match [2].
[1] https://github.com/ocaml/ocaml/issues/9189
[2] https://ocaml.org/docs/license.html
Closes: https://bugs.gentoo.org/688108
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Ralph Seichter seichter.de>
Signed-off-by: Mikle Kolyada gentoo.org>
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.09.0.ebuild | 76 ++
2 files changed, 77 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index cdb9691eb47..01c355f8949 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,4 +1,5 @@
DIST ocaml-4.04.2.tar.gz 4061873 BLAKE2B
756936592c7e0c87da27f154f07850eb3e4b2ed46ff3b36ff57541375840cd56b170dbe646ef6682f63d4e15ae209d3c125581803641f07403e9eb838c265519
SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
DIST ocaml-4.05.0.tar.gz 4431750 BLAKE2B
c2ab003a13e0a581ebd0e1c96eeb8a9baea9bfe6bee08823b0e4541819201ec109f1846e13fc1aefa51a001eefbb8f73320ba854d41975fc68cef41bc75b1ecc
SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
+DIST ocaml-4.09.0.tar.gz 4838748 BLAKE2B
80f29d535c64bf2371b480217723ed20b2b21cfd93ce31366a7b91e7ddffdf68db4e88d085288b7e21efee567a13f42ecff24c3a0115507b006acf844239cefd
SHA512
dc0271e591bf929b751705835790949a9d741e12d085c8b207c3689b5838a02ea8de80da8b2605d2e6744f2f541b0d1694ffafff9509e99ce01f3a391f6ef2ae
DIST ocaml-patches-8.tar.bz2 1803 BLAKE2B
5e76a198c2f5ca9f231d4e80499d784cf061ec79bf6b5e3aac917e1260d1f2b927f0f8015d39c01ce4fd481d32a5d211c31e081a7ab87ba1e7c7d5def95bc0fb
SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
DIST ocaml-patches-9.tar.bz2 1700 BLAKE2B
4e46b8fb490db28f815414e285f54e251394ea53e1d25c529bbea9f03e426fd19132b1e2c7c2be7d14983fceb4cad073d191b001f6da522fee4226371d4a2eca
SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
diff --git a/dev-lang/ocaml/ocaml-4.09.0.ebuild
b/dev-lang/ocaml/ocaml-4.09.0.ebuild
new file mode 100644
index 000..feadd4f5804
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.09.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+HOMEPAGE="https://ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Programming language supporting functional, imperative &
object-oriented styles"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="emacs flambda latex +ocamlopt spacetime xemacs"
+
+RDEPEND="sys-libs/binutils-libs:=
+ spacetime? ( sys-libs/libunwind:= )"
+BDEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+src_prepare() {
+ default
+ # Upstream build ignores LDFLAGS in several places.
+ sed -i -e 's/\(^MKDLL=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_CFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ -e 's/\(^OC_LDFLAGS=.*\)/\1 $(LDFLAGS)/' \
+ Makefile.config.in || die "LDFLAGS fix failed"
+ # ${P} overrides upstream build's own P due to a wrong assignment
operator.
+ sed -i -e 's/^P ?=/P =/' stdlib/StdlibModules || die "P fix failed"
+}
+
+src_configure() {
+ local opt=(
+ --bindir="${EPREFIX}/usr/bin"
+ --libdir="${EPREFIX}/usr/$(get_libdir)/ocaml"
+ --mandir="${EPREFIX}/usr/share/man"
+ --prefix="${EPREFIX}/usr"
+ $(use_enable flambda)
+ $(use_enable spacetime)
+ )
+ econf ${opt[@]}
+}
+
+src_compile() {
+ if use ocamlopt ; then
+ emake world.opt
+ else
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/, dev-lang/ocaml/
commit: 45d7b4d6d7c5e9f2ca1d742a53072f3a92cb5a91
Author: Lars Wendler gentoo org>
AuthorDate: Fri Mar 22 09:46:07 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Mar 22 10:05:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d7b4d6
dev-lang/ocaml: Fixed build with sys-libs/ncurses[tinfo]
Closes: https://bugs.gentoo.org/459512
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch | 13 +
dev-lang/ocaml/ocaml-4.04.2-r1.ebuild | 3 ++-
dev-lang/ocaml/ocaml-4.05.0-r1.ebuild | 3 ++-
3 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch
b/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch
new file mode 100644
index 000..ceeb8299109
--- /dev/null
+++ b/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/459512
+
+--- ocaml-4.04.2/configure
ocaml-4.04.2/configure
+@@ -1095,7 +1095,7 @@
+ # For the terminfo module
+
+ if test "$with_curses" = "yes"; then
+- for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
++ for libs in "" "-ltinfo" "-lcurses" "-ltermcap" "-lcurses -ltermcap"
"-lncurses"; do
+ if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
+ inf "termcap functions found (with libraries '$libs')"
+ echo "#define HAS_TERMCAP" >> s.h
diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
index f790ab2d1cd..60c56bef2e4 100644
--- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -43,6 +43,7 @@ pkg_setup() {
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+ epatch "${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512
}
src_configure() {
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
index f0a79f5e329..16b090dacbf 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -44,6 +44,7 @@ pkg_setup() {
src_prepare() {
EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+ epatch "${FILESDIR}/${PN}-4.04.2-tinfo.patch" #459512
}
src_configure() {
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 7e6c642ba2e5d0337fa53cf5e821f8aff9f208ff
Author: Tim Harder gentoo org>
AuthorDate: Fri Jan 4 18:36:58 2019 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Jan 4 18:38:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6c642b
dev-lang/ocaml: use https for HOMEPAGE
Signed-off-by: Tim Harder gentoo.org>
dev-lang/ocaml/ocaml-4.04.2-r1.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.05.0-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
index 27b31db0df9..f790ab2d1cd 100644
--- a/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic eutils multilib versionator toolchain-funcs
PATCHLEVEL="8"
MY_P="${P/_/-}"
DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="http://www.ocaml.org/;
+HOMEPAGE="https://ocaml.org;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
diff --git a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
index 078795d8000..f0a79f5e329 100644
--- a/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic eutils multilib versionator toolchain-funcs
PATCHLEVEL="9"
MY_P="${P/_/-}"
DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="http://www.ocaml.org/;
+HOMEPAGE="https://ocaml.org;
SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 718610b8e44c2bf400d3186cf10b25bba1e963b1
Author: Matt Turner gentoo org>
AuthorDate: Sat Apr 28 01:02:31 2018 +
Commit: Matt Turner gentoo org>
CommitDate: Sat Apr 28 01:02:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=718610b8
dev-lang/ocaml: Drop unnecessary x11-proto dep
dev-lang/ocaml/{ocaml-4.04.2.ebuild => ocaml-4.04.2-r1.ebuild} | 2 +-
dev-lang/ocaml/{ocaml-4.05.0.ebuild => ocaml-4.05.0-r1.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild
b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
similarity index 98%
rename from dev-lang/ocaml/ocaml-4.04.2.ebuild
rename to dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
index cf9890317ec..27b31db0df9 100644
--- a/dev-lang/ocaml/ocaml-4.04.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2-r1.ebuild
@@ -22,7 +22,7 @@ IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
sys-libs/binutils-libs:=
ncurses? ( sys-libs/ncurses:0= )
- X? ( x11-libs/libX11 x11-proto/xproto )"
+ X? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
diff --git a/dev-lang/ocaml/ocaml-4.05.0.ebuild
b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
similarity index 98%
rename from dev-lang/ocaml/ocaml-4.05.0.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
index a7d4ff33ac5..078795d8000 100644
--- a/dev-lang/ocaml/ocaml-4.05.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0-r1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
sys-libs/binutils-libs:=
ncurses? ( sys-libs/ncurses:0= )
spacetime? ( sys-libs/libunwind:= )
- X? ( x11-libs/libX11 x11-proto/xproto )"
+ X? ( x11-libs/libX11 )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: a6d01be9822256081a797c10f53641415d9b7a96
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Nov 4 09:53:14 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Nov 4 09:53:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d01be9
dev-lang/ocaml: bump to 4.06
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-lang/ocaml/Manifest | 2 +-
dev-lang/ocaml/{ocaml-4.06.0_rc1.ebuild => ocaml-4.06.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index b59eb5ee0e9..17834f42912 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,6 +1,6 @@
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0.tar.gz 4431750 SHA256
e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
WHIRLPOOL
75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
-DIST ocaml-4.06.0-rc1.tar.gz 4577071 SHA256
846bd2046988c3cfb0c2430c9fabbef9c21c77edd001e314fe63bd1eecd018cd SHA512
efda9949a49a4efef4d9fe06c0e027e894e1ea978d4c36a5cdb1b6bfdaae26fa2d7a2753d0922cca65a4978a11e4c76a246b479af4454885aa8f4b33401f0c2c
WHIRLPOOL
e76c60caf651ec74f1c22f374bea8b50dcaf7479d4ac4b8e1b952435a968ec6e39f3cb12cee297e652616db351b77ebbb4104adea3748607a940cc1819b3f9b4
+DIST ocaml-4.06.0.tar.gz 4575476 SHA256
011879c913e8f988ecdac020b205e2baa4023052efed25013bdb9a6b0d5c6a80 SHA512
612884cd7b185838539aefcf43ac2ed21f415c3054542a8a94a3c2e24a2054548f75277c404521fb3c1e2e3742f82dd66437a74310348ef611b71d425d2047db
WHIRLPOOL
f08cd4f229dc384deb1b8905289ebd035bdfb30837da484efd97e2470ff68d53bfd1ac0fa1e105bb523fefc86eb0713802d2345b828c9e3dd8f8f8bc0287c6ca
DIST ocaml-patches-10.tar.bz2 943 SHA256
4fbd5ca4ed1755f8a37d8c101342552a4f60c8c0b651e46a703b8da8a9451894 SHA512
fe39066c25267f2ff828e6746bcda5f5b1e40e22a063d83268cfcc2fcda28dbd7e714751466491385d054ba2eadff2d0a4c407d5fe5db2f98931bdde612f07e9
WHIRLPOOL
752bfc72838654b8448bb0d5516f10eba77eb399fb71953bbad129db206567340f29b8d8568c2ec728e3fe17ccb858fd161ee3d451570d9447c9f63f5d7ac582
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.06.0_rc1.ebuild
b/dev-lang/ocaml/ocaml-4.06.0.ebuild
similarity index 100%
rename from dev-lang/ocaml/ocaml-4.06.0_rc1.ebuild
rename to dev-lang/ocaml/ocaml-4.06.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 60940e91cca42fbb99bd0ca38892fb55e5e0dc00
Author: Alexis Ballier gentoo org>
AuthorDate: Tue Oct 31 09:04:34 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Nov 4 09:37:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60940e91
dev-lang/ocaml: bump to 4.06.0-rc1
Package-Manager: Portage-2.3.13, Repoman-2.3.4
dev-lang/ocaml/Manifest | 2 +-
dev-lang/ocaml/{ocaml-4.06.0_beta2.ebuild => ocaml-4.06.0_rc1.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index d2bb039e186..b59eb5ee0e9 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,6 +1,6 @@
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0.tar.gz 4431750 SHA256
e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
WHIRLPOOL
75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
-DIST ocaml-4.06.0-beta2.tar.gz 4566450 SHA256
65130faa992c11a629f0c08621f64cc4ee34368d3df64636fcf1af31f2cb4b26 SHA512
d4c46ccf01e38736b946879298347cedb81dbf3d26fc877fefc11eb42743cf8e0133b419805f3ca0fed52d7338549f18ca5ad378f2661939e526b6f803f26483
WHIRLPOOL
102da0db2e7d3e0615dd5f23180df51b8589ce3833e8dbd1842248c0a0f3bfcaf3fd50c753b2e7129880fc29d9c6a7b0170d3c52d570f2eb2437c56cd1e38a28
+DIST ocaml-4.06.0-rc1.tar.gz 4577071 SHA256
846bd2046988c3cfb0c2430c9fabbef9c21c77edd001e314fe63bd1eecd018cd SHA512
efda9949a49a4efef4d9fe06c0e027e894e1ea978d4c36a5cdb1b6bfdaae26fa2d7a2753d0922cca65a4978a11e4c76a246b479af4454885aa8f4b33401f0c2c
WHIRLPOOL
e76c60caf651ec74f1c22f374bea8b50dcaf7479d4ac4b8e1b952435a968ec6e39f3cb12cee297e652616db351b77ebbb4104adea3748607a940cc1819b3f9b4
DIST ocaml-patches-10.tar.bz2 943 SHA256
4fbd5ca4ed1755f8a37d8c101342552a4f60c8c0b651e46a703b8da8a9451894 SHA512
fe39066c25267f2ff828e6746bcda5f5b1e40e22a063d83268cfcc2fcda28dbd7e714751466491385d054ba2eadff2d0a4c407d5fe5db2f98931bdde612f07e9
WHIRLPOOL
752bfc72838654b8448bb0d5516f10eba77eb399fb71953bbad129db206567340f29b8d8568c2ec728e3fe17ccb858fd161ee3d451570d9447c9f63f5d7ac582
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.06.0_beta2.ebuild
b/dev-lang/ocaml/ocaml-4.06.0_rc1.ebuild
similarity index 100%
rename from dev-lang/ocaml/ocaml-4.06.0_beta2.ebuild
rename to dev-lang/ocaml/ocaml-4.06.0_rc1.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 288454d53d16bac0bac387aff43dfcf0449885c1
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Oct 14 11:30:48 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Oct 14 11:30:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=288454d5
dev-lang/ocaml: bump to 4.06.0_beta2
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-lang/ocaml/Manifest | 2 +-
dev-lang/ocaml/{ocaml-4.06.0_beta1.ebuild => ocaml-4.06.0_beta2.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 324e80c9c1e..d2bb039e186 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,6 +1,6 @@
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0.tar.gz 4431750 SHA256
e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
WHIRLPOOL
75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
-DIST ocaml-4.06.0-beta1.tar.gz 4558889 SHA256
d46ecd2f69782760241f56744bc41f1286d8864e38f8efb15341573577d37435 SHA512
c7ec8468bae99cd5d7b3a44ef856c3b000e60004c9acc590fd0eb0ef4acbc59a79ddee35c765171b3c58f6c1b2663194d6b0d08d668aec418f056a265dd49012
WHIRLPOOL
37b200dd7adf19acc60224b8e8dd51ef146187e00d796a25685b19717fd8d1644bb6c7a80961654db5bff44d4ab9e182c36e4b959b2888cf30718527559fb29f
+DIST ocaml-4.06.0-beta2.tar.gz 4566450 SHA256
65130faa992c11a629f0c08621f64cc4ee34368d3df64636fcf1af31f2cb4b26 SHA512
d4c46ccf01e38736b946879298347cedb81dbf3d26fc877fefc11eb42743cf8e0133b419805f3ca0fed52d7338549f18ca5ad378f2661939e526b6f803f26483
WHIRLPOOL
102da0db2e7d3e0615dd5f23180df51b8589ce3833e8dbd1842248c0a0f3bfcaf3fd50c753b2e7129880fc29d9c6a7b0170d3c52d570f2eb2437c56cd1e38a28
DIST ocaml-patches-10.tar.bz2 943 SHA256
4fbd5ca4ed1755f8a37d8c101342552a4f60c8c0b651e46a703b8da8a9451894 SHA512
fe39066c25267f2ff828e6746bcda5f5b1e40e22a063d83268cfcc2fcda28dbd7e714751466491385d054ba2eadff2d0a4c407d5fe5db2f98931bdde612f07e9
WHIRLPOOL
752bfc72838654b8448bb0d5516f10eba77eb399fb71953bbad129db206567340f29b8d8568c2ec728e3fe17ccb858fd161ee3d451570d9447c9f63f5d7ac582
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
b/dev-lang/ocaml/ocaml-4.06.0_beta2.ebuild
similarity index 100%
rename from dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
rename to dev-lang/ocaml/ocaml-4.06.0_beta2.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 146718a228a7cdd4bd01d50639d10fdab6c2bdbd
Author: Alexis Ballier gentoo org>
AuthorDate: Sat Oct 14 11:03:58 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sat Oct 14 11:13:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146718a2
dev-lang/ocaml: restore keywords on 4.06 now that it is masked
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
b/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
index 0c6b2bbfed8..85cb7d57e42 100644
--- a/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
@@ -16,8 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-# still in beta
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: df3159382891504259ebadd5d35604ef15a00ad0
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Oct 4 08:56:52 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Oct 4 11:09:09 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df315938
dev-lang/ocaml: add 4.06.0_beta1
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-lang/ocaml/Manifest | 2 +
dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild | 127 +++
2 files changed, 129 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index fa530ce92e5..324e80c9c1e 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,4 +1,6 @@
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0.tar.gz 4431750 SHA256
e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
WHIRLPOOL
75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
+DIST ocaml-4.06.0-beta1.tar.gz 4558889 SHA256
d46ecd2f69782760241f56744bc41f1286d8864e38f8efb15341573577d37435 SHA512
c7ec8468bae99cd5d7b3a44ef856c3b000e60004c9acc590fd0eb0ef4acbc59a79ddee35c765171b3c58f6c1b2663194d6b0d08d668aec418f056a265dd49012
WHIRLPOOL
37b200dd7adf19acc60224b8e8dd51ef146187e00d796a25685b19717fd8d1644bb6c7a80961654db5bff44d4ab9e182c36e4b959b2888cf30718527559fb29f
+DIST ocaml-patches-10.tar.bz2 943 SHA256
4fbd5ca4ed1755f8a37d8c101342552a4f60c8c0b651e46a703b8da8a9451894 SHA512
fe39066c25267f2ff828e6746bcda5f5b1e40e22a063d83268cfcc2fcda28dbd7e714751466491385d054ba2eadff2d0a4c407d5fe5db2f98931bdde612f07e9
WHIRLPOOL
752bfc72838654b8448bb0d5516f10eba77eb399fb71953bbad129db206567340f29b8d8568c2ec728e3fe17ccb858fd161ee3d451570d9447c9f63f5d7ac582
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
b/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
new file mode 100644
index 000..0c6b2bbfed8
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.06.0_beta1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="10"
+MY_P="${P/_/-}"
+DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
+HOMEPAGE="http://www.ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+# still in beta
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
+
+RDEPEND="
+ sys-libs/binutils-libs:=
+ ncurses? ( sys-libs/ncurses:0= )
+ spacetime? ( sys-libs/libunwind:= )
+ X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
+ # results in relocations if gcc wants to create a PIE executable
+ if gcc-specs-pie ; then
+ append-ldflags -nopie
+ ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
+ ewarn "We have appended -nopie to ocaml build options"
+ ewarn "because linking an executable with pie
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 198f61a7fcbfa73c3faadb3ff99162114e038170
Author: Alexis Ballier gentoo org>
AuthorDate: Wed Oct 4 08:18:02 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Wed Oct 4 11:09:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=198f61a7
dev-lang/ocaml: Remove old
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-lang/ocaml/Manifest| 2 -
dev-lang/ocaml/ocaml-4.04.0.ebuild | 127 -
dev-lang/ocaml/ocaml-4.04.1.ebuild | 127 -
3 files changed, 256 deletions(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 4ec1cd6bb2f..fa530ce92e5 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,3 @@
-DIST ocaml-4.04.0.tar.gz 4057711 SHA256
03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512
288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d
WHIRLPOOL
91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
-DIST ocaml-4.04.1.tar.gz 4061830 SHA256
9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512
d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103
WHIRLPOOL
56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0.tar.gz 4431750 SHA256
e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
WHIRLPOOL
75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
diff --git a/dev-lang/ocaml/ocaml-4.04.0.ebuild
b/dev-lang/ocaml/ocaml-4.04.0.ebuild
deleted file mode 100644
index 9fde924947f..000
--- a/dev-lang/ocaml/ocaml-4.04.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="8"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="http://www.ocaml.org/;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd
~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
-
-RDEPEND="
- sys-libs/binutils-libs:=
- ncurses? ( sys-libs/ncurses:0= )
- X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
- xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
- # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
- # results in relocations if gcc wants to create a PIE executable
- if gcc-specs-pie ; then
- append-ldflags -nopie
- ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
- ewarn "We have appended -nopie to ocaml build options"
- ewarn "because linking an executable with pie while the objects
are not pic will not work"
- fi
-}
-
-src_prepare() {
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-}
-
-src_configure() {
- export LC_ALL=C
- local myconf=""
-
- # Causes build failures because it builds some programs with -pg,
- # bug #270920
- filter-flags -fomit-frame-pointer
- # Bug #285993
- filter-mfpmath sse
-
- # -ggdb3 & co makes it behave weirdly, breaks sexplib
- replace-flags
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: da0c51586dbd304042f0c06beac5dee298363c47
Author: Sergei Trofimovich gentoo org>
AuthorDate: Wed Sep 27 09:23:21 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Sep 27 09:23:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da0c5158
dev-lang/ocaml: stable 4.04.2 for hppa, bug #622544
Package-Manager: Portage-2.3.10, Repoman-2.3.3
RepoMan-Options: --include-arches="hppa"
dev-lang/ocaml/ocaml-4.04.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild
b/dev-lang/ocaml/ocaml-4.04.2.ebuild
index 264ea202f96..cf9890317ec 100644
--- a/dev-lang/ocaml/ocaml-4.04.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 84c4c5683821d787c70616e7a0da30e239eb2a37
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jul 13 21:22:22 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jul 13 22:09:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c4c568
dev-lang/ocaml: serialize build a bit more as it sometimes fails
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/ocaml-4.05.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0.ebuild
b/dev-lang/ocaml/ocaml-4.05.0.ebuild
index 50a84eacf4e..a7d4ff33ac5 100644
--- a/dev-lang/ocaml/ocaml-4.05.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0.ebuild
@@ -93,7 +93,7 @@ src_compile() {
if use ocamlopt ; then
# bug #279968
emake opt
- emake opt.opt
+ emake -j1 opt.opt
fi
}
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 997d76e3e1474293729bfe5a3f3f40279d11191f
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jul 13 18:37:49 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jul 13 20:42:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=997d76e3
dev-lang/ocaml: dont enable flambda by default yet, it causes infinite loop
when building e.g. dose3
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/ocaml-4.05.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0.ebuild
b/dev-lang/ocaml/ocaml-4.05.0.ebuild
index 32d26aa50e0..50a84eacf4e 100644
--- a/dev-lang/ocaml/ocaml-4.05.0.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0.ebuild
@@ -17,7 +17,7 @@ LICENSE="QPL-1.0 LGPL-2"
# so here we go with the subslot.
SLOT="0/${PV}"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
-IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs"
+IUSE="emacs flambda latex ncurses +ocamlopt spacetime X xemacs"
RDEPEND="
sys-libs/binutils-libs:=
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 02cd07c801af102cb1160b4a9ac03b0b5f7c0578
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jul 13 12:38:37 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jul 13 12:38:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02cd07c8
dev-lang/ocaml: Bump to 4.05
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/Manifest | 2 +-
dev-lang/ocaml/{ocaml-4.05.0_rc1.ebuild => ocaml-4.05.0.ebuild} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 06f7a2b7e13..4ec1cd6bb2f 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,6 +1,6 @@
DIST ocaml-4.04.0.tar.gz 4057711 SHA256
03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512
288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d
WHIRLPOOL
91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
DIST ocaml-4.04.1.tar.gz 4061830 SHA256
9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512
d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103
WHIRLPOOL
56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
-DIST ocaml-4.05.0-rc1.tar.gz 4431747 SHA256
11fbf2eb1939d8352cee4f48b9621e95c10ca124a99b2403f92b6228f6b5c3dd SHA512
0ff2e2d3e27ad10b047dba43c11761ab0b834c245ffef83530db50fde8f0c5c50b6e17f4ff44c5fcfc60b9f6105bd2dd9c387cb36e10ede1331cd5379e3be14b
WHIRLPOOL
05059c0062076d714684840a08190ed7c77bf6683a2010553873d2f1e08e114cefc694c90713de659d48e425d09084c192b4a495f8e18e37c68603c8064d711a
+DIST ocaml-4.05.0.tar.gz 4431750 SHA256
e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512
9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225
WHIRLPOOL
75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.05.0_rc1.ebuild
b/dev-lang/ocaml/ocaml-4.05.0.ebuild
similarity index 100%
rename from dev-lang/ocaml/ocaml-4.05.0_rc1.ebuild
rename to dev-lang/ocaml/ocaml-4.05.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 146bf052b3938a63fe2207aa31c90d7707a966ff
Author: Markus Meier gentoo org>
AuthorDate: Fri Jul 7 06:17:51 2017 +
Commit: Markus Meier gentoo org>
CommitDate: Fri Jul 7 06:17:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=146bf052
dev-lang/ocaml: arm stable, bug #622544
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="arm"
dev-lang/ocaml/ocaml-4.04.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild
b/dev-lang/ocaml/ocaml-4.04.2.ebuild
index d0e9e6f1af4..2d93e1fe145 100644
--- a/dev-lang/ocaml/ocaml-4.04.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: ada141326532def289883c4c102aab22dcf617fa
Author: Sergei Trofimovich gentoo org>
AuthorDate: Fri Jun 30 07:14:40 2017 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Jun 30 08:12:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ada14132
dev-lang/ocaml: ia64 stable, bug #622544
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/ocaml-4.04.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild
b/dev-lang/ocaml/ocaml-4.04.2.ebuild
index a22dd7723ea..a82f0899e88 100644
--- a/dev-lang/ocaml/ocaml-4.04.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: a2d28e3858a9279f1803bc0975600a45ea38eec5
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jun 29 07:17:06 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jun 29 20:28:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2d28e38
dev-lang/ocaml: Remove old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/Manifest | 1 -
dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild | 129 ---
2 files changed, 130 deletions(-)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 77f547ba084..06f7a2b7e13 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,7 +1,6 @@
DIST ocaml-4.04.0.tar.gz 4057711 SHA256
03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512
288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d
WHIRLPOOL
91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
DIST ocaml-4.04.1.tar.gz 4061830 SHA256
9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512
d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103
WHIRLPOOL
56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
-DIST ocaml-4.05.0-beta3.tar.gz 4424084 SHA256
3d82d5b32310d1c010981c12508e0ff63fb71b0c89457bcac813b7c291d4b61c SHA512
4c31f2b1f43d2c81ea9e8a6b86439806ab3b4b1ab6c6ae35bc98bbd2a993d94b9e26744febebe1d2424c5ee2deb8b5c9c45ff6fbf96bc629758dec86877fff80
WHIRLPOOL
c2ecf0f8d4a9ee9fe92d1a0cbd3c16a4a341d6b8c1acd7077f8602aa730c88f7d58cf15f867da5f93c54de8c9f4984f5f12ae27ce3accedc0e4eeb0e0d73fc77
DIST ocaml-4.05.0-rc1.tar.gz 4431747 SHA256
11fbf2eb1939d8352cee4f48b9621e95c10ca124a99b2403f92b6228f6b5c3dd SHA512
0ff2e2d3e27ad10b047dba43c11761ab0b834c245ffef83530db50fde8f0c5c50b6e17f4ff44c5fcfc60b9f6105bd2dd9c387cb36e10ede1331cd5379e3be14b
WHIRLPOOL
05059c0062076d714684840a08190ed7c77bf6683a2010553873d2f1e08e114cefc694c90713de659d48e425d09084c192b4a495f8e18e37c68603c8064d711a
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
deleted file mode 100644
index 32d26aa50e0..000
--- a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils multilib versionator toolchain-funcs
-
-PATCHLEVEL="9"
-MY_P="${P/_/-}"
-DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
-HOMEPAGE="http://www.ocaml.org/;
-SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
- mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
-
-LICENSE="QPL-1.0 LGPL-2"
-# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
-# so here we go with the subslot.
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
-IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs"
-
-RDEPEND="
- sys-libs/binutils-libs:=
- ncurses? ( sys-libs/ncurses:0= )
- spacetime? ( sys-libs/libunwind:= )
- X? ( x11-libs/libX11 x11-proto/xproto )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-PDEPEND="emacs? ( app-emacs/ocaml-mode )
- xemacs? ( app-xemacs/ocaml )"
-
-S="${WORKDIR}/${MY_P}"
-pkg_setup() {
- # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
-
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 20d5a00479c12a67042fc963f3ff081ab09bb731
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jun 29 07:16:33 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jun 29 20:28:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20d5a004
dev-lang/ocaml: Bump to 4.05.0_rc1
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.05.0_rc1.ebuild | 129 +
2 files changed, 130 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 4392e6f2b5c..77f547ba084 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -2,5 +2,6 @@ DIST ocaml-4.04.0.tar.gz 4057711 SHA256
03e49d09d5a509216ca0cc8fccd10df3ad9dd441
DIST ocaml-4.04.1.tar.gz 4061830 SHA256
9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512
d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103
WHIRLPOOL
56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0-beta3.tar.gz 4424084 SHA256
3d82d5b32310d1c010981c12508e0ff63fb71b0c89457bcac813b7c291d4b61c SHA512
4c31f2b1f43d2c81ea9e8a6b86439806ab3b4b1ab6c6ae35bc98bbd2a993d94b9e26744febebe1d2424c5ee2deb8b5c9c45ff6fbf96bc629758dec86877fff80
WHIRLPOOL
c2ecf0f8d4a9ee9fe92d1a0cbd3c16a4a341d6b8c1acd7077f8602aa730c88f7d58cf15f867da5f93c54de8c9f4984f5f12ae27ce3accedc0e4eeb0e0d73fc77
+DIST ocaml-4.05.0-rc1.tar.gz 4431747 SHA256
11fbf2eb1939d8352cee4f48b9621e95c10ca124a99b2403f92b6228f6b5c3dd SHA512
0ff2e2d3e27ad10b047dba43c11761ab0b834c245ffef83530db50fde8f0c5c50b6e17f4ff44c5fcfc60b9f6105bd2dd9c387cb36e10ede1331cd5379e3be14b
WHIRLPOOL
05059c0062076d714684840a08190ed7c77bf6683a2010553873d2f1e08e114cefc694c90713de659d48e425d09084c192b4a495f8e18e37c68603c8064d711a
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.05.0_rc1.ebuild
b/dev-lang/ocaml/ocaml-4.05.0_rc1.ebuild
new file mode 100644
index 000..32d26aa50e0
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.05.0_rc1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="9"
+MY_P="${P/_/-}"
+DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
+HOMEPAGE="http://www.ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
+IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs"
+
+RDEPEND="
+ sys-libs/binutils-libs:=
+ ncurses? ( sys-libs/ncurses:0= )
+ spacetime? ( sys-libs/libunwind:= )
+ X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
+ # results in relocations if gcc wants to create a PIE executable
+ if gcc-specs-pie ; then
+ append-ldflags -nopie
+ ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
+ ewarn "We have appended -nopie to ocaml build options"
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 06c436cd285c5855a0030208a93514e0bf0fbfea
Author: Agostino Sarubbo gentoo org>
AuthorDate: Thu Jun 29 08:06:18 2017 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Thu Jun 29 08:06:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06c436cd
dev-lang/ocaml: amd64 stable wrt bug #622544
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
dev-lang/ocaml/ocaml-4.04.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild
b/dev-lang/ocaml/ocaml-4.04.2.ebuild
index aad6abb1102..a22dd7723ea 100644
--- a/dev-lang/ocaml/ocaml-4.04.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 3ec79a02a0972efec433ab20c755aed4fb164ab5
Author: Alexis Ballier gentoo org>
AuthorDate: Sun Jun 25 11:04:19 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Sun Jun 25 14:42:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec79a02
dev-lang/ocaml: Bump to 4.04.2, bug #622544
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/Manifest| 1 +
dev-lang/ocaml/ocaml-4.04.2.ebuild | 127 +
2 files changed, 128 insertions(+)
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest
index 8e8baed18ba..4392e6f2b5c 100644
--- a/dev-lang/ocaml/Manifest
+++ b/dev-lang/ocaml/Manifest
@@ -1,5 +1,6 @@
DIST ocaml-4.04.0.tar.gz 4057711 SHA256
03e49d09d5a509216ca0cc8fccd10df3ad9dd441d7633e89974a74e149be3c51 SHA512
288c514e7ccfe29fe9a65239d04f000b3b05df71f15bc05b3e5af50cb233544b4fec22baad69f60de587e8f0f8f65ee023a5b709896a1a68f9fd6fe30b81344d
WHIRLPOOL
91fea4195ed84fb97f2ae68e30f47ce60a2404bc47ca809f6e0d182dd755833ea16a2e033ee0a02fab008f5905a2a9b6fa8dc2194c75b8d9daa353eb6b1d70e9
DIST ocaml-4.04.1.tar.gz 4061830 SHA256
9aea1867848e370ae79f9aea4d48b04daf416478b0f43dfcb3a0f4d3ecf5f8e4 SHA512
d1bb536cd4c596752fb9e508f6b37b2d23a41350ecda866b8a890e15e5248b16e08bb99c9d02ed6cab8eed73162ae555cf6ef250f498e27f7463e6a724a5c103
WHIRLPOOL
56d16ba29596fb3952580643b5103415a46231af30cb0e86a9c8d3d200aa689d1cdeeda260494435ee958abbc3caab70b34a42622e9e9a61f3ad8d3c4e146a7d
+DIST ocaml-4.04.2.tar.gz 4061873 SHA256
6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512
8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb
WHIRLPOOL
b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0-beta3.tar.gz 4424084 SHA256
3d82d5b32310d1c010981c12508e0ff63fb71b0c89457bcac813b7c291d4b61c SHA512
4c31f2b1f43d2c81ea9e8a6b86439806ab3b4b1ab6c6ae35bc98bbd2a993d94b9e26744febebe1d2424c5ee2deb8b5c9c45ff6fbf96bc629758dec86877fff80
WHIRLPOOL
c2ecf0f8d4a9ee9fe92d1a0cbd3c16a4a341d6b8c1acd7077f8602aa730c88f7d58cf15f867da5f93c54de8c9f4984f5f12ae27ce3accedc0e4eeb0e0d73fc77
DIST ocaml-patches-8.tar.bz2 1803 SHA256
bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512
fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411
WHIRLPOOL
ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256
1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512
cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0
WHIRLPOOL
185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857
diff --git a/dev-lang/ocaml/ocaml-4.04.2.ebuild
b/dev-lang/ocaml/ocaml-4.04.2.ebuild
new file mode 100644
index 000..aad6abb1102
--- /dev/null
+++ b/dev-lang/ocaml/ocaml-4.04.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit flag-o-matic eutils multilib versionator toolchain-funcs
+
+PATCHLEVEL="8"
+MY_P="${P/_/-}"
+DESCRIPTION="Type-inferring functional programming language descended from the
ML family"
+HOMEPAGE="http://www.ocaml.org/;
+SRC_URI="https://github.com/ocaml/ocaml/archive/${PV/_/+}.tar.gz ->
${MY_P}.tar.gz
+ mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="QPL-1.0 LGPL-2"
+# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
+# so here we go with the subslot.
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
+
+RDEPEND="
+ sys-libs/binutils-libs:=
+ ncurses? ( sys-libs/ncurses:0= )
+ X? ( x11-libs/libX11 x11-proto/xproto )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PDEPEND="emacs? ( app-emacs/ocaml-mode )
+ xemacs? ( app-xemacs/ocaml )"
+
+S="${WORKDIR}/${MY_P}"
+pkg_setup() {
+ # dev-lang/ocaml creates its own objects but calls gcc for linking,
which will
+ # results in relocations if gcc wants to create a PIE executable
+ if gcc-specs-pie ; then
+ append-ldflags -nopie
+ ewarn "Ocaml generates its own native asm, you're using a PIE
compiler"
+ ewarn "We have appended -nopie to ocaml build options"
+ ewarn "because linking an executable with pie while the objects
are not pic will not work"
+ fi
+}
+
+src_prepare() {
+ EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+}
+
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: e6e3511a0854d90a3e2fea28b6434228933a7cfa
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Jun 20 13:35:09 2017 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Jun 20 13:35:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6e3511a
dev-lang/ocaml: add Prefix keywords, bug #618700
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
index a2108b420ed..32d26aa50e0 100644
--- a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
~sparc-solaris ~x86-solaris"
IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 0c354cab7a1f6fa456f224bd12ca40abe0bf9769
Author: Alexis Ballier gentoo org>
AuthorDate: Thu Jun 15 13:44:05 2017 +
Commit: Alexis Ballier gentoo org>
CommitDate: Thu Jun 15 13:44:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c354cab
dev-lang/ocaml: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-lang/ocaml/ocaml-4.04.1.ebuild | 2 +-
dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-lang/ocaml/ocaml-4.04.1.ebuild
b/dev-lang/ocaml/ocaml-4.04.1.ebuild
index 7c0d656a3ef..aad6abb1102 100644
--- a/dev-lang/ocaml/ocaml-4.04.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.04.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs flambda latex ncurses +ocamlopt X xemacs"
RDEPEND="
diff --git a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
b/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
index b0682dc0ccf..a2108b420ed 100644
--- a/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
+++ b/dev-lang/ocaml/ocaml-4.05.0_beta3.ebuild
@@ -16,7 +16,7 @@ LICENSE="QPL-1.0 LGPL-2"
# Everytime ocaml is updated to a new version, everything ocaml must be
rebuilt,
# so here we go with the subslot.
SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="emacs +flambda latex ncurses +ocamlopt spacetime X xemacs"
RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/
commit: 10c111e220f2e45fa220d9c2a2aaa88a52cf38d3 Author: Alexis Ballier gentoo org> AuthorDate: Thu Apr 27 10:38:39 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Apr 27 10:40:03 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10c111e2 dev-lang/ocaml: add remoteid Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-lang/ocaml/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-lang/ocaml/metadata.xml b/dev-lang/ocaml/metadata.xml index 8824d14f0ce..720c6c5d8b3 100644 --- a/dev-lang/ocaml/metadata.xml +++ b/dev-lang/ocaml/metadata.xml @@ -9,4 +9,7 @@ Enables the Flambda optimizer: A new intermediate representation (introduced in ocaml 4.03) in the depths of the compiler designed to allow for better inlining. Enables the Spacetime memory profiler. See https://caml.inria.fr/pub/docs/manual-ocaml/spacetime.html for more information. + + ocaml/ocaml +
