commit:     8982970356da7bc7349bf7be8754a6aed8b17fe3
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 13 20:52:23 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jun 13 20:52:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89829703

dev-ml/ocplib-simplex: respect LDFLAGS and remove warning

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

 .../files/ocplib-simplex-0.4-flags.patch           | 48 ++++++++++++++++++++++
 dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild    | 10 ++++-
 2 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch 
b/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch
new file mode 100644
index 00000000000..ac76488238d
--- /dev/null
+++ b/dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch
@@ -0,0 +1,48 @@
+--- a/Makefile.in      2020-06-13 22:27:11.971906805 +0200
++++ b/Makefile.in      2020-06-13 22:28:14.193938195 +0200
+@@ -73,19 +73,19 @@
+ opt: src/$(LIBNAME).cma src/$(LIBNAME).cmxa  src/$(LIBNAME).cmxs
+ 
+ src/$(LIBNAME).cma: src/$(LIBNAME).cmo
+-      $(OCAMLC) -a $(BFLAGS_LIGHT) -o $@ $^
++      $(OCAMLC) -a $(BFLAGS_LIGHT) -ccopt "$(CFLAGS)" -o $@ $^
+ 
+ src/$(LIBNAME).cmxa: src/$(LIBNAME).cmx
+-      $(OCAMLOPT) -a $(OFLAGS_LIGHT) -o $@ $^
++      $(OCAMLOPT) -a $(OFLAGS_LIGHT) -ccopt "$(CFLAGS)" -o $@ $^
+ 
+ src/$(LIBNAME).cmxs: src/$(LIBNAME).cmx
+-      $(OCAMLOPT) -shared $(OFLAGS_LIGHT) -o $@ $^
++      $(OCAMLOPT) -shared $(OFLAGS_LIGHT) -ccopt "$(CFLAGS)" -cclib 
"$(LDFLAGS)" -o $@ $^
+ 
+ src/$(LIBNAME).cmo: $(CMO) # src/$(LIBNAME).cmi
+-      $(OCAMLC)   $(BFLAGS_LIGHT) -pack -o src/$(LIBNAME).cmo $^
++      $(OCAMLC)   $(BFLAGS_LIGHT) -ccopt "$(CFLAGS)" -pack -o 
src/$(LIBNAME).cmo $^
+ 
+ src/$(LIBNAME).cmx: $(CMX) # src/$(LIBNAME).cmi
+-      $(OCAMLOPT) $(OFLAGS_LIGHT) -pack -o src/$(LIBNAME).cmx $^
++      $(OCAMLOPT) $(OFLAGS_LIGHT) -pack -ccopt "$(CFLAGS)" -o 
src/$(LIBNAME).cmx $^
+ 
+ src/extSigs.ml: src/extSigs.mli
+       cp src/extSigs.mli src/extSigs.ml
+@@ -125,16 +125,16 @@
+ .SUFFIXES: .mli .ml .cmi .cmo .cmx .mll .mly .tex .dvi .ps .html
+ 
+ .mli.cmi:
+-      $(OCAMLC) -c $(BFLAGS) $<
++      $(OCAMLC) -c $(BFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .ml.cmo:
+-      $(OCAMLC) -c $(BFLAGS) $<
++      $(OCAMLC) -c $(BFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .ml.o:
+-      $(OCAMLOPT) -c $(OFLAGS) $<
++      $(OCAMLOPT) -c $(OFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .ml.cmx:
+-      $(OCAMLOPT) -c $(OFLAGS) $<
++      $(OCAMLOPT) -c $(OFLAGS) -ccopt "$(CFLAGS)" $<
+ 
+ .mll.ml:
+       $(OCAMLLEX) $< > /dev/null

diff --git a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild 
b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
index e43a4e3d084..d032ec5579b 100644
--- a/dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild
+++ b/dev-ml/ocplib-simplex/ocplib-simplex-0.4.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
@@ -20,6 +20,14 @@ RDEPEND="${DEPEND}"
 
 DOCS="CHANGES.md README.md extra/simplex_invariants.txt extra/TODO.txt"
 
+PATCHES=(
+       "${FILESDIR}"/${P}-flags.patch
+)
+
+QA_FLAGS_IGNORED=(
+       /usr/lib64/ocaml/ocplib-simplex/ocplibSimplex.cmxs
+)
+
 src_prepare() {
        default
        mv configure.{in,ac} || die

Reply via email to