summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2020-06-13 22:52:23 +0200
committerAlfredo Tupone <tupone@gentoo.org>2020-06-13 22:52:23 +0200
commit8982970356da7bc7349bf7be8754a6aed8b17fe3 (patch)
tree30a87eb0e68df5c491ce2b846265ff0bc935d49e /dev-ml/ocplib-simplex
parentapp-admin/rex: bump version to 1.11.0 (diff)
downloadgentoo-8982970356da7bc7349bf7be8754a6aed8b17fe3.tar.gz
gentoo-8982970356da7bc7349bf7be8754a6aed8b17fe3.tar.bz2
gentoo-8982970356da7bc7349bf7be8754a6aed8b17fe3.zip
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@gentoo.org>
Diffstat (limited to 'dev-ml/ocplib-simplex')
-rw-r--r--dev-ml/ocplib-simplex/files/ocplib-simplex-0.4-flags.patch48
-rw-r--r--dev-ml/ocplib-simplex/ocplib-simplex-0.4.ebuild10
2 files changed, 57 insertions, 1 deletions
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 000000000000..ac76488238d4
--- /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 e43a4e3d0841..d032ec5579be 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