* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/
@ 2022-02-22 0:56 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-02-22 0:56 UTC (permalink / raw
To: gentoo-commits
commit: b25f82e790bbcf0f05f434212958ae2e192df08e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 22 00:46:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 22 00:46:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b25f82e7
dev-lang/ocaml: scrub patches
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch | 20 +++++++++---------
dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch | 15 --------------
dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch | 24 +++++++++++-----------
dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch | 15 --------------
dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch | 16 +++++++--------
dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch | 18 ----------------
6 files changed, 30 insertions(+), 78 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
index a0c67da534a0..8b2e99883167 100644
--- a/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-gcc10.patch
@@ -1,5 +1,5 @@
---- a/byterun/caml/intext.h 2021-01-28 22:46:20.400224678 +0100
-+++ b/byterun/caml/intext.h 2021-01-28 22:46:49.312751054 +0100
+--- a/byterun/caml/intext.h
++++ b/byterun/caml/intext.h
@@ -196,7 +196,7 @@
CAMLextern struct code_fragment * caml_extern_find_code(char *addr);
@@ -9,8 +9,8 @@
#endif /* CAML_INTERNALS */
---- a/byterun/caml/major_gc.h 2021-01-28 22:44:12.193323457 +0100
-+++ b/byterun/caml/major_gc.h 2021-01-28 22:45:20.918198701 +0100
+--- a/byterun/caml/major_gc.h
++++ b/byterun/caml/major_gc.h
@@ -64,9 +64,9 @@
extern char *caml_gc_sweep_hp;
@@ -24,8 +24,8 @@
extern double caml_gc_clock;
/* [caml_major_gc_hook] is called just between the end of the mark
---- a/byterun/meta.c 2021-01-28 22:47:34.148016359 +0100
-+++ b/byterun/meta.c 2021-01-28 22:47:56.048657393 +0100
+--- a/byterun/meta.c
++++ b/byterun/meta.c
@@ -32,6 +32,8 @@
#include "caml/prims.h"
#include "caml/stacks.h"
@@ -35,8 +35,8 @@
#ifndef NATIVE_CODE
CAMLprim value caml_get_global_data(value unit)
---- a/byterun/backtrace.c 2021-01-28 22:50:25.275226598 +0100
-+++ b/byterun/backtrace.c 2021-01-28 22:50:37.541027290 +0100
+--- a/byterun/backtrace.c
++++ b/byterun/backtrace.c
@@ -28,7 +28,7 @@
#include "caml/fail.h"
@@ -46,8 +46,8 @@
CAMLexport int32_t caml_backtrace_active = 0;
CAMLexport int32_t caml_backtrace_pos = 0;
---- a/asmrun/startup.c 2021-01-28 23:02:50.526072662 +0100
-+++ b/asmrun/startup.c 2021-01-28 23:03:09.977754311 +0100
+--- a/asmrun/startup.c
++++ b/asmrun/startup.c
@@ -44,7 +44,7 @@
#endif
diff --git a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch
index 28d7f48f5b27..d95d2bb0fa50 100644
--- a/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch
+++ b/dev-lang/ocaml/files/ocaml-4.05.0-glibc-2.34.patch
@@ -18,15 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread
stops.
(partial back-port of PR#10266 and PR#10726)
----
- asmrun/fail.c | 7 ++++-
- asmrun/signals_asm.c | 69 ++++++++++++++++++++++++++++++++++++++------
- asmrun/startup.c | 7 ++++-
- byterun/sys.c | 5 ++++
- 4 files changed, 77 insertions(+), 11 deletions(-)
-
-diff --git a/asmrun/fail.c b/asmrun/fail.c
-index d73cb88524c..2f064320185 100644
--- a/asmrun/fail.c
+++ b/asmrun/fail.c
@@ -31,6 +31,8 @@
@@ -50,8 +41,6 @@ index d73cb88524c..2f064320185 100644
#ifndef Stack_grows_upwards
#define PUSHED_AFTER <
-diff --git a/asmrun/signals_asm.c b/asmrun/signals_asm.c
-index f124a076749..b4e2516ae1a 100644
--- a/asmrun/signals_asm.c
+++ b/asmrun/signals_asm.c
@@ -194,7 +194,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
@@ -140,8 +129,6 @@ index f124a076749..b4e2516ae1a 100644
+ }
+#endif
+}
-diff --git a/asmrun/startup.c b/asmrun/startup.c
-index 70bbc4369dc..a1cb06a7d1e 100644
--- a/asmrun/startup.c
+++ b/asmrun/startup.c
@@ -92,6 +92,7 @@ void (*caml_termination_hook)(void *) = NULL;
@@ -175,8 +162,6 @@ index 70bbc4369dc..a1cb06a7d1e 100644
}
void caml_startup(char **argv)
-diff --git a/byterun/sys.c b/byterun/sys.c
-index 3706e9002d5..aa152239ebf 100644
--- a/byterun/sys.c
+++ b/byterun/sys.c
@@ -111,6 +111,8 @@ static void caml_sys_check_path(value name)
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
index 8d2391407a35..d0a947da0ea6 100644
--- a/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-cflags.patch
@@ -1,5 +1,5 @@
---- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100
-+++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100
+--- a/runtime/Makefile
++++ b/runtime/Makefile
@@ -335,7 +335,7 @@
# (without the extension, which is added by the macro)
define COMPILE_C_FILE
@@ -9,24 +9,24 @@
endef
object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
---- a/yacc/Makefile 2022-01-22 20:02:56.510340885 +0100
-+++ b/yacc/Makefile 2022-01-22 20:03:14.998000508 +0100
+--- a/yacc/Makefile
++++ b/yacc/Makefile
@@ -63,4 +63,4 @@
# also works for .obj files.
%.$(O): %.c
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
---- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100
-+++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100
+--- a/otherlibs/Makefile.otherlibs.common
++++ b/otherlibs/Makefile.otherlibs.common
@@ -138,4 +138,4 @@
$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
.c.$(O):
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
---- a/ocamltest/Makefile 2022-01-22 20:30:22.454009704 +0100
-+++ b/ocamltest/Makefile 2022-01-22 20:30:33.845799603 +0100
+--- a/ocamltest/Makefile
++++ b/ocamltest/Makefile
@@ -221,7 +221,7 @@
$(ocamllex) -q $<
@@ -36,8 +36,8 @@
ocamltest_config.ml: ocamltest_config.ml.in Makefile ../Makefile.config
sed \
---- a/otherlibs/systhreads/Makefile 2022-01-22 20:42:17.647349876 +0100
-+++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100
+--- a/otherlibs/systhreads/Makefile
++++ b/otherlibs/systhreads/Makefile
@@ -93,11 +93,11 @@
# twice, each time with different options).
@@ -52,8 +52,8 @@
-I$(ROOTDIR)/runtime $(SHAREDLIB_CFLAGS) -DNATIVE_CODE \
-DTARGET_$(ARCH) -DMODEL_$(MODEL) -DSYS_$(SYSTEM) \
$(OUTPUTOBJ)$@ -c $<
---- a/tools/Makefile 2022-01-23 09:57:00.788877931 +0100
-+++ b/tools/Makefile 2022-01-23 09:57:21.735516656 +0100
+--- a/tools/Makefile
++++ b/tools/Makefile
@@ -322,7 +322,7 @@
endif
diff --git a/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch
index 6f74d38e80b6..48127343a3f4 100644
--- a/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch
+++ b/dev-lang/ocaml/files/ocaml-4.09.0-glibc-2.34.patch
@@ -18,15 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread
stops.
(partial back-port of PR#10266 and PR#10726)
----
- runtime/fail_nat.c | 7 ++++-
- runtime/signals_nat.c | 64 +++++++++++++++++++++++++++++++++++++------
- runtime/startup_nat.c | 7 ++++-
- runtime/sys.c | 5 ++++
- 4 files changed, 72 insertions(+), 11 deletions(-)
-
-diff --git a/runtime/fail_nat.c b/runtime/fail_nat.c
-index e1f687d379e..cbf7633ee9e 100644
--- a/runtime/fail_nat.c
+++ b/runtime/fail_nat.c
@@ -31,6 +31,8 @@
@@ -50,8 +41,6 @@ index e1f687d379e..cbf7633ee9e 100644
while (caml_local_roots != NULL &&
(char *) caml_local_roots < caml_exception_pointer) {
-diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c
-index 29a5f49e625..351b575a08e 100644
--- a/runtime/signals_nat.c
+++ b/runtime/signals_nat.c
@@ -182,7 +182,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
@@ -132,8 +121,6 @@ index 29a5f49e625..351b575a08e 100644
}
#endif
}
-diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c
-index 7eca5fa5581..f52bec980b6 100644
--- a/runtime/startup_nat.c
+++ b/runtime/startup_nat.c
@@ -92,6 +92,7 @@ void (*caml_termination_hook)(void *) = NULL;
@@ -167,8 +154,6 @@ index 7eca5fa5581..f52bec980b6 100644
}
value caml_startup_exn(char_os **argv)
-diff --git a/runtime/sys.c b/runtime/sys.c
-index 226d596cdff..9e201354e1e 100644
--- a/runtime/sys.c
+++ b/runtime/sys.c
@@ -112,6 +112,8 @@ static void caml_sys_check_path(value name)
diff --git a/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch
index 01117c39887d..7adb1ea0768d 100644
--- a/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch
+++ b/dev-lang/ocaml/files/ocaml-4.10.2-cflags.patch
@@ -1,5 +1,5 @@
---- a/runtime/Makefile 2022-01-22 19:49:32.914213696 +0100
-+++ b/runtime/Makefile 2022-01-22 19:50:03.765640701 +0100
+--- a/runtime/Makefile
++++ b/runtime/Makefile
@@ -335,7 +335,7 @@
# (without the extension, which is added by the macro)
define COMPILE_C_FILE
@@ -9,16 +9,16 @@
endef
object_types := % %_b %_bd %_bi %_bpic %_n %_nd %_ni %_np %_npic
---- a/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:15.316779625 +0100
-+++ b/otherlibs/Makefile.otherlibs.common 2022-01-22 20:24:50.730126701 +0100
+--- a/otherlibs/Makefile.otherlibs.common
++++ b/otherlibs/Makefile.otherlibs.common
@@ -138,4 +138,4 @@
$(CAMLOPT) -c $(COMPFLAGS) $(OPTCOMPFLAGS) $<
.c.$(O):
- $(CC) -c $(OC_CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
+ $(CC) -c $(OC_CFLAGS) $(CFLAGS) $(OC_CPPFLAGS) $(OUTPUTOBJ)$@ $<
---- a/otherlibs/systhreads/Makefile 2022-01-22 20:42:17.647349876 +0100
-+++ b/otherlibs/systhreads/Makefile 2022-01-22 20:43:29.766086103 +0100
+--- a/otherlibs/systhreads/Makefile
++++ b/otherlibs/systhreads/Makefile
@@ -102,10 +102,10 @@
st_stubs_n.$(O): OC_CPPFLAGS += $(NATIVE_CPPFLAGS)
@@ -32,8 +32,8 @@
partialclean:
rm -f *.cm*
---- a/Makefile.common.in 2022-01-23 18:05:04.192323554 +0100
-+++ b/Makefile.common.in 2022-01-23 18:05:17.211122643 +0100
+--- a/Makefile.common.in
++++ b/Makefile.common.in
@@ -79,4 +79,4 @@
# general (it supports both .o and .obj)
diff --git a/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch b/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch
index 8ce76701366a..4c157ddd90b8 100644
--- a/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch
+++ b/dev-lang/ocaml/files/ocaml-4.10.2-glibc-2.34.patch
@@ -18,16 +18,6 @@ The alternate signal stack is freed when the main OCaml code / an OCaml thread
stops.
(partial back-port of PR#10266 and PR#10726)
----
- otherlibs/systhreads/st_stubs.c | 2 +
- runtime/fail_nat.c | 7 ++-
- runtime/signals_nat.c | 87 ++++++++++++++++++++++++++++-----
- runtime/startup_nat.c | 7 ++-
- runtime/sys.c | 5 ++
- 5 files changed, 95 insertions(+), 13 deletions(-)
-
-diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c
-index e46a67be9dc..0b441934ae9 100644
--- a/otherlibs/systhreads/st_stubs.c
+++ b/otherlibs/systhreads/st_stubs.c
@@ -140,6 +140,7 @@ static st_retcode caml_threadstatus_wait (value);
@@ -46,8 +36,6 @@ index e46a67be9dc..0b441934ae9 100644
#endif
/* The thread now stops running */
return 0;
-diff --git a/runtime/fail_nat.c b/runtime/fail_nat.c
-index 380578ac47b..4ea658684b4 100644
--- a/runtime/fail_nat.c
+++ b/runtime/fail_nat.c
@@ -32,6 +32,8 @@
@@ -71,8 +59,6 @@ index 380578ac47b..4ea658684b4 100644
while (Caml_state->local_roots != NULL &&
(char *) Caml_state->local_roots < Caml_state->exception_pointer) {
-diff --git a/runtime/signals_nat.c b/runtime/signals_nat.c
-index 017298394e9..b4c58259fc2 100644
--- a/runtime/signals_nat.c
+++ b/runtime/signals_nat.c
@@ -191,8 +191,6 @@ DECLARE_SIGNAL_HANDLER(trap_handler)
@@ -196,8 +182,6 @@ index 017298394e9..b4c58259fc2 100644
+ return 0;
#endif
}
-diff --git a/runtime/startup_nat.c b/runtime/startup_nat.c
-index 91ff81b3fac..b80d0ffbd5e 100644
--- a/runtime/startup_nat.c
+++ b/runtime/startup_nat.c
@@ -93,6 +93,7 @@ void (*caml_termination_hook)(void *) = NULL;
@@ -231,8 +215,6 @@ index 91ff81b3fac..b80d0ffbd5e 100644
}
value caml_startup_exn(char_os **argv)
-diff --git a/runtime/sys.c b/runtime/sys.c
-index d5636199c9f..45f8c8e8100 100644
--- a/runtime/sys.c
+++ b/runtime/sys.c
@@ -112,6 +112,8 @@ static void caml_sys_check_path(value name)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/
@ 2023-11-15 17:27 Alfredo Tupone
0 siblings, 0 replies; 3+ messages in thread
From: Alfredo Tupone @ 2023-11-15 17:27 UTC (permalink / raw
To: gentoo-commits
commit: afa9c354085529b2b8f88418645a3b34fe5f4bcc
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Nov 7 18:02:45 2023 +0000
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 17:26:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afa9c354
dev-lang/ocaml: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/33710
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch b/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch
deleted file mode 100644
index ceeb82991098..000000000000
--- a/dev-lang/ocaml/files/ocaml-4.04.2-tinfo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://bugs.gentoo.org/459512
-
---- ocaml-4.04.2/configure
-+++ ocaml-4.04.2/configure
-@@ -1095,7 +1095,7 @@
- # For the terminfo module
-
- if test "$with_curses" = "yes"; then
-- for libs in "" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
-+ for libs in "" "-ltinfo" "-lcurses" "-ltermcap" "-lcurses -ltermcap" "-lncurses"; do
- if sh ./hasgot $libs tgetent tgetstr tgetnum tputs; then
- inf "termcap functions found (with libraries '$libs')"
- echo "#define HAS_TERMCAP" >> s.h
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/
@ 2024-06-22 18:54 Conrad Kostecki
0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-06-22 18:54 UTC (permalink / raw
To: gentoo-commits
commit: acc130ae2b9d811437a7b3b42bc9c8786c9d26fd
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Jun 18 17:21:25 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jun 22 18:50:37 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acc130ae
dev-lang/ocaml: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
dev-lang/ocaml/files/ocaml-4.14.0-clang.patch | 132 --------------------------
1 file changed, 132 deletions(-)
diff --git a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch b/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch
deleted file mode 100644
index cd3c042f2639..000000000000
--- a/dev-lang/ocaml/files/ocaml-4.14.0-clang.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-commit 28b553622bd0f168411d86ddcfba1adab0d87b92
-Author: Yawar Amin <yawar.amin@gmail.com>
-Date: Mon Nov 15 22:40:43 2021 -0500
-
- Fix ranlib error
-
- - Always pass ranlib one file argument at a time to avoid error 'Exactly
- one archive should be specified'
- - Call ranlib without cd'ing into the library's directory
- - Use Makefile functionality to simplify recipes
-
-diff --git a/Makefile b/Makefile
-index c2522c775..2e4e44faa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -549,6 +549,8 @@ else
- endif
- $(MAKE) -C tools installopt
-
-+LIBRARIES = $(addsuffix .$(A), ocamlcommon ocamlbytecomp ocamloptcomp)
-+
- .PHONY: installoptopt
- installoptopt:
- $(INSTALL_PROG) ocamlc.opt$(EXE) "$(INSTALL_BINDIR)"
-@@ -585,8 +587,11 @@ endif
- ifeq "$(INSTALL_OCAMLNAT)" "true"
- $(INSTALL_PROG) ocamlnat$(EXE) "$(INSTALL_BINDIR)"
- endif
-- cd "$(INSTALL_COMPLIBDIR)" && \
-- $(RANLIB) ocamlcommon.$(A) ocamlbytecomp.$(A) ocamloptcomp.$(A)
-+# Some versions of ranlib do not support multiple archives
-+ for library in $(LIBRARIES); \
-+ do \
-+ $(RANLIB) "$(INSTALL_COMPLIBDIR)/$$library"; \
-+ done
-
- # Installation of the *.ml sources of compiler-libs
- .PHONY: install-compiler-sources
-diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common
-index 95ff4d58f..6a4451e47 100644
---- a/otherlibs/Makefile.otherlibs.common
-+++ b/otherlibs/Makefile.otherlibs.common
-@@ -95,7 +95,7 @@ install::
- fi
- ifneq "$(STUBSLIB)" ""
- $(INSTALL_DATA) $(STUBSLIB) "$(INSTALL_LIBDIR)/"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) lib$(CLIBNAME).$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/lib$(CLIBNAME).$(A)"
- endif
-
- $(INSTALL_DATA) \
-@@ -104,7 +104,7 @@ endif
- ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
- $(INSTALL_DATA) \
- $(CMIFILES:.cmi=.mli) \
-- $(CMIFILES:.cmi=.cmti) \
-+ $(CMIFILES:.cmi=.cmti) \
- "$(INSTALL_LIBDIR)/"
- endif
- if test -n "$(HEADERS)"; then \
-@@ -115,7 +115,7 @@ installopt:
- $(INSTALL_DATA) \
- $(CAMLOBJS_NAT) $(LIBNAME).cmxa $(LIBNAME).$(A) \
- "$(INSTALL_LIBDIR)/"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) $(LIBNAME).a
-+ $(RANLIB) "$(INSTALL_LIBDIR)/$(LIBNAME).$(A)"
- if test -f $(LIBNAME).cmxs; then \
- $(INSTALL_PROG) $(LIBNAME).cmxs "$(INSTALL_LIBDIR)"; \
- fi
-diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile
-index 6b02dc197..dccc45103 100644
---- a/otherlibs/dynlink/Makefile
-+++ b/otherlibs/dynlink/Makefile
-@@ -249,12 +249,12 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true"
- endif
-
- installopt:
-- if $(NATDYNLINK); then \
-- $(INSTALL_DATA) \
-- $(NATOBJS) dynlink.cmxa dynlink.$(A) \
-- "$(INSTALL_LIBDIR)" && \
-- cd "$(INSTALL_LIBDIR)" && $(RANLIB) dynlink.$(A); \
-- fi
-+ifeq "$(NATDYNLINK)" "true"
-+ $(INSTALL_DATA) \
-+ $(NATOBJS) dynlink.cmxa dynlink.$(A) \
-+ "$(INSTALL_LIBDIR)"
-+ $(RANLIB) "$(INSTALL_LIBDIR)/dynlink.$(A)"
-+endif
-
- partialclean:
- rm -f $(extract_crc) *.cm[ioaxt] *.cmti *.cmxa \
-diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile
-index 8fc1bdb92..379c530fa 100644
---- a/otherlibs/systhreads/Makefile
-+++ b/otherlibs/systhreads/Makefile
-@@ -121,7 +121,7 @@ install:
- $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \
- fi
- $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/libthreads.$(A)"
- mkdir -p "$(INSTALL_THREADSLIBDIR)"
- $(INSTALL_DATA) \
- $(CMIFILES) threads.cma \
-@@ -136,11 +136,11 @@ endif
-
- installopt:
- $(INSTALL_DATA) libthreadsnat.$(A) "$(INSTALL_LIBDIR)"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreadsnat.$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/libthreadsnat.$(A)"
- $(INSTALL_DATA) \
- $(THREADS_NCOBJS) threads.cmxa threads.$(A) \
- "$(INSTALL_THREADSLIBDIR)"
-- cd "$(INSTALL_THREADSLIBDIR)" && $(RANLIB) threads.$(A)
-+ $(RANLIB) "$(INSTALL_THREADSLIBDIR)/threads.$(A)"
-
- %.cmi: %.mli
- $(CAMLC) -c $(COMPFLAGS) $<
-diff --git a/stdlib/Makefile b/stdlib/Makefile
-index df34bc2d4..32c5dab56 100644
---- a/stdlib/Makefile
-+++ b/stdlib/Makefile
-@@ -105,7 +105,7 @@ installopt-default::
- $(INSTALL_DATA) \
- stdlib.cmxa stdlib.$(A) std_exit.$(O) *.cmx \
- "$(INSTALL_LIBDIR)"
-- cd "$(INSTALL_LIBDIR)"; $(RANLIB) stdlib.$(A)
-+ $(RANLIB) "$(INSTALL_LIBDIR)/stdlib.$(A)"
-
- ifeq "$(UNIX_OR_WIN32)" "unix"
- HEADERPROGRAM = header
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-06-22 18:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 17:27 [gentoo-commits] repo/gentoo:master commit in: dev-lang/ocaml/files/ Alfredo Tupone
-- strict thread matches above, loose matches on Subject: below --
2024-06-22 18:54 Conrad Kostecki
2022-02-22 0:56 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox