[gentoo-commits] repo/gentoo:master commit in: dev-ml/num/files/, dev-ml/num/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/num/files/, dev-ml/num/

[Alfredo Tupone]

commit:     42825e870a32b5f52e4266f75bbc313129403c90
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 17:04:09 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu May 21 17:04:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42825e87

dev-ml/num: use CFLAGS

Closes: https://bugs.gentoo.org/723748
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/num/files/num-1.3-cflags.patch | 11 +++++++++++
 dev-ml/num/num-1.3.ebuild             |  8 ++++++++
 2 files changed, 19 insertions(+)

diff --git a/dev-ml/num/files/num-1.3-cflags.patch b/dev-ml/num/files/num-1.3-cflags.patch
new file mode 100644
index 00000000000..771455c4f72
--- /dev/null
+++ b/dev-ml/num/files/num-1.3-cflags.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile	2020-05-21 18:54:31.176399032 +0200
++++ b/src/Makefile	2020-05-21 18:55:27.881498310 +0200
+@@ -65,7 +65,7 @@
+ %.cmx: %.ml
+ 	$(OCAMLOPT) $(CAMLOPTFLAGS) -c $*.ml
+ %.$(O): %.c
+-	$(OCAMLC) -ccopt -DBNG_ARCH_$(BNG_ARCH) -c $*.c
++	$(OCAMLC) -ccopt "-DBNG_ARCH_$(BNG_ARCH) $(CFLAGS)" -c $*.c
+ 
+ # Legacy installation: files go into OCaml's stdlib directory; only META
+ # is installed via findlib

diff --git a/dev-ml/num/num-1.3.ebuild b/dev-ml/num/num-1.3.ebuild
index aaa82b73caa..8cea1449708 100644
--- a/dev-ml/num/num-1.3.ebuild
+++ b/dev-ml/num/num-1.3.ebuild
@@ -19,6 +19,14 @@ DEPEND=">=dev-lang/ocaml-4.09.0[ocamlopt]
 RDEPEND="${DEPEND}"
 BDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cflags.patch
+)
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}"
+}
+
 src_install() {
 	findlib_src_preinst
 	OCAMLPATH="${OCAMLFIND_DESTDIR}" emake install DESTDIR="${D}"

[gentoo-commits] repo/gentoo:master commit in: dev-ml/num/files/, dev-ml/num/

[Alfredo Tupone]

commit:     df63ec0cfb7adccbc4e0e70b00a4a989ec474035
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 12 19:03:24 2022 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Jan 12 19:03:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df63ec0c

dev-ml/num: respect ocamlopt

Closes: https://bugs.gentoo.org/822321
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/num/files/num-1.4-ocamlopt.patch | 15 +++++++++++++++
 dev-ml/num/num-1.4-r3.ebuild            |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/dev-ml/num/files/num-1.4-ocamlopt.patch b/dev-ml/num/files/num-1.4-ocamlopt.patch
new file mode 100644
index 000000000000..90699b99474c
--- /dev/null
+++ b/dev-ml/num/files/num-1.4-ocamlopt.patch
@@ -0,0 +1,15 @@
+--- a/src/Makefile	2022-01-12 19:58:54.655901110 +0100
++++ b/src/Makefile	2022-01-12 19:59:25.446339664 +0100
+@@ -33,11 +33,10 @@
+ 
+ all:: libnums.$(A) nums.cma
+ 
++ifeq "$(NATDYNLINK)" "true"
+ ifneq "$(ARCH)" "none"
+ all:: nums.cmxa
+ endif
+-
+-ifeq "$(NATDYNLINK)" "true"
+ all:: nums.cmxs
+ endif
+ 

diff --git a/dev-ml/num/num-1.4-r3.ebuild b/dev-ml/num/num-1.4-r3.ebuild
index 4b0101e0e90f..6440704457e1 100644
--- a/dev-ml/num/num-1.4-r3.ebuild
+++ b/dev-ml/num/num-1.4-r3.ebuild
@@ -19,6 +19,8 @@ RDEPEND="dev-lang/ocaml:=[ocamlopt?]"
 BDEPEND="${RDEPEND}"
 DEPEND="dev-ml/findlib:=[ocamlopt?]"
 
+PATCHES=( "${FILESDIR}"/${P}-ocamlopt.patch )
+
 src_compile() {
 	emake CFLAGS="${CFLAGS}" NATDYNLINK="$(usex ocamlopt true false)"
 }