[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-ctypes/files/

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-ctypes/files/

[Alfredo Tupone]

commit:     55b98d04bce7e732765d876c5f3417d532b0bd4c
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 19:55:16 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 21:00:08 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b98d04

dev-ml/ocaml-ctypes: align with commited code

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
index 51bad2efdd7c..633abf770724 100644
--- a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
+++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
@@ -4,10 +4,9 @@
                     $(INSTALL_HEADERS) \
                     $(if $(filter yes,$($(PROJECT).install_native_objects)),$(NATIVE_OBJECTS)))
  
--install: META-install $(PROJECTS:%=install-%)
-+install:
-+	$(MAKE) META-install
-+	$(MAKE) $(PROJECTS:%=install-%)
++$(PROJECTS:%=install-%): META-install
++
+ install: META-install $(PROJECTS:%=install-%)
  
  uninstall:
  	$(OCAMLFIND) remove ctypes

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-ctypes/files/

[Alfredo Tupone]

commit:     f987066cfdf80b851b0114b321d669c0d1a89c76
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 21:25:52 2023 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 21:26:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f987066c

dev-ml/ocaml-ctypes: fix deps on Makefile

Closes: https://bugs.gentoo.org/882367
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
index 633abf770724..014b0437b1e8 100644
--- a/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
+++ b/dev-ml/ocaml-ctypes/files/ocaml-ctypes-0.20.0-shuffle.patch
@@ -10,3 +10,14 @@
  
  uninstall:
  	$(OCAMLFIND) remove ctypes
+--- a/Makefile.rules	2023-01-24 22:19:00.571780005 +0100
++++ b/Makefile.rules	2023-01-24 22:18:06.710631483 +0100
+@@ -99,7 +99,7 @@
+ $(BUILDDIR)/dll%_stubs_xen$(EXTDLL): $$(XEN_OBJECTS)
+ 	$(OCAMLMKLIB) -o $(BUILDDIR)/$*_stubs_xen $^ $(OCAMLMKLIB_FLAGS) $(OCAMLMKLIB_EXTRA_FLAGS)
+ 
+-$(BUILDDIR)/%.cmxs : $$(NATIVE_OBJECTS)
++$(BUILDDIR)/%.cmxs : $$(NATIVE_OBJECTS) $(C_OBJECTS)
+ 	$(OCAMLFIND) opt -shared -linkall $(OCAMLFLAGS) $(THREAD_FLAG) $(OCAMLFIND_PACKAGE_FLAGS) -o $@ $(NATIVE_OBJECTS) $(C_OBJECTS) $(OCAML_LINK_FLAGS)
+ 
+ $(BUILDDIR)/%.cma: $$(BYTE_OBJECTS)