diff options
Diffstat (limited to 'dev-lang/ocaml')
| -rw-r--r-- | dev-lang/ocaml/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/ocaml/files/ocaml-4.14.0-clang.patch | 132 |
2 files changed, 0 insertions, 133 deletions
diff --git a/dev-lang/ocaml/Manifest b/dev-lang/ocaml/Manifest index fb370ba12e0c..f7fc86ec58f8 100644 --- a/dev-lang/ocaml/Manifest +++ b/dev-lang/ocaml/Manifest @@ -2,7 +2,6 @@ AUX ocaml-4.11.2-cflags.patch 1416 BLAKE2B 722ffd7944c3dabd753e98bfb885ad283aa5b AUX ocaml-4.11.2-glibc-2.34.patch 3318 BLAKE2B 96fe61e553e7c67f76df32f2e5532f7a6eae57fb60752c7c49d71baf416ac74a4c7b925ecfd0bd5874a1728b51ca36b82d636bfa6ab30ec5f3df37fbac2a73b9 SHA512 eb54d912338a42a21f736dcd1591f77403b0dff8772059bd7f39a6e83b8a5e89bd5a7a9d4200bacbcaa8ec0450a5a78ecf6645bb5405d45fd1c077cbe1c36f7f AUX ocaml-4.12.0-glibc-2.34.patch 3411 BLAKE2B d5138feaf6ca1e4a25ee85100013e343f8867bfe22d1c8c26df56fe1a6266b9cf37738f0b5fa6ee6daaaed9c90880529a50ffa1e789766039727dd407d15da51 SHA512 978a300d28bcb4c4d312e5b9f830140b08a282ba850d7c7a3866ca54413a321695d21315fff423d646085d8eed148a3f84567c08a4e09957b4b87010d65ee694 AUX ocaml-4.12.1-fix-textrel-riscv.patch 1784 BLAKE2B 700fca8fe6c30a301bca5a64ed94038923bec1df80e6a75d4afb88ecfc38c9c55f5c163dfb12506f6b3a1e5784e65314385e13b9f45230b9f3b3e7d771c89b2e SHA512 f4f3a4b1f3f9fd823e09338c7c06ce6abc8699a765c0aa442e3b66ae72a83bb6dee744bfc0cb527a1131bbbe0ae5a5fd1d51c4700b62927f1fdf25a47e541e80 -AUX ocaml-4.14.0-clang.patch 4301 BLAKE2B 6a06b6524167b48cb711c75504d9f724caf90f4a808013d93aebd3429344a45e74350f4de405a298986f5b113ccb661b1307e4fc583f3b58dc013ee8e9a8bd52 SHA512 e68f11cae4bbab9fcd5b591f4082c8b15a79427bd76dfe51025b309601f5ff61ee57863cbe1d1a6249fb5d7f17d3e0f3c6e451925d0e130ea88e64b8d8d151dc AUX ocaml-rebuild.sh 1120 BLAKE2B 6f88a9f2b99fae7f89b884bb08d2c6ad6a0e14d4a8fd06d498037f78c5f6ef040428f9de224b5fe5df4ef64eaed419cda6d8715ea0c0a4c4dad60c5cf75a4147 SHA512 05a3e81e95533135d9895091c21621c73ae82851abd4889d64f035979eb25f8d90b60f469d7ef5e789fd1a4adffd6bbe255e6708c14c24a04f8a423507d19a40 AUX ocaml.conf 177 BLAKE2B da070848d9e3a30ad303c296f55de87c30fd15feee3304ccc1d1f844d83c5a646664cd4d9958375ead2324e25bb88280fdb78f9e4230eeb8cd5825eed6f2f91d SHA512 4f0a48b8101b77d568d8d0a852f2a21fd46b7947c5d3f975ee4cd8a9c37c993d689cf5fb53b54a6b2740cb865051dc50c74c0c373eb697fca800ca143d401aa4 DIST ocaml-4.09.0-patches-1.tar.bz2 3300 BLAKE2B ef710ea5ed5a243ae684f68b7f203ba454192c9f8f19c32697d336bf18cf2a0e8ea08df232b0fd8e2475a000758a5ba95b3794096ec7d0d1b292a715ab3de86f SHA512 94096b99fd58b32232e418c5736203f08ab3c1558154ed00d4290730bd4db849bc60dfae6160f344acce63bbb8eaceecee25cf836bb73fa419d7bbf4eac433f1 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 |