[gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/

["Sam James" <sam@gentoo.org>]

commit:     4bbb6a45f6d3e0193703828d6cdf04b46babc7b9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 18:13:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 18:22:35 2021 +0000
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 <sam <AT> 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 280d813184b..b9fe45e6172 100644
--- a/dev-lang/ocaml/ocaml-4.11.1.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.1.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.2.ebuild b/dev-lang/ocaml/ocaml-4.11.2.ebuild
index 280d813184b..e3298bdfc89 100644
--- a/dev-lang/ocaml/ocaml-4.11.2.ebuild
+++ b/dev-lang/ocaml/ocaml-4.11.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)/' \