<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/294e221e4b48a6424a03663a221cfbe2e0a11999">https://github.com/macports/macports-ports/commit/294e221e4b48a6424a03663a221cfbe2e0a11999</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 294e221e4b4 ocaml-num: update to 1.5
</span>294e221e4b4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 294e221e4b48a6424a03663a221cfbe2e0a11999
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Jan 28 23:37:59 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> ocaml-num: update to 1.5
</span>---
ocaml/ocaml-num/Portfile | 12 +--
ocaml/ocaml-num/files/patch-no-ocamlopt.diff | 114 ++++++++++++++++++---------
2 files changed, 85 insertions(+), 41 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-num/Portfile b/ocaml/ocaml-num/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4bd2885a799..dc489eef826 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-num/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-num/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortGroup github 1.0
</span> PortGroup ocaml 1.1
name ocaml-num
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ocaml num 1.4 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ocaml num 1.5 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories ocaml devel
maintainers {pmetzger @pmetzger} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,12 +15,14 @@ license LGPL-2
</span> description Legacy OCaml arbitrary-precision integer library
long_description {*}${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 8ce8a2e8f3bd6941b0d1ce2d09f0e78a512f1b05 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d3b0b448739b96cd90faa096cdaf8925eff824a654b0fd6cb877a94e9f6d49bd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 66364
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 070877307764b6b059abf50950abe81a6e2a7f41 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 7ae07c8f5601e2dfc5008a62dcaf2719912ae596a19365c5d7bdf2230515959a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 67633
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
platform darwin powerpc {
# Compilation freezes due to ocamlopt not being found.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/ocaml/num/issues/39
</span> patchfiles-append patch-no-ocamlopt.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/ocaml/ocaml-num/files/patch-no-ocamlopt.diff b/ocaml/ocaml-num/files/patch-no-ocamlopt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index baf3ad40d1c..de3729dc1bd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/ocaml/ocaml-num/files/patch-no-ocamlopt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/ocaml/ocaml-num/files/patch-no-ocamlopt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# At the moment, there is no ocamlopt on PPC due to broken assembler implementation in OCaml.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Compilation freezes, since ocamlopt cannot be found.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+There is no bytecode-only target, and build system is incapable of detecting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+that ocamlopt is unavailable. So for now we just cut it out by hand.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ocaml/num/issues/39
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Not to be used on officially supported by OCaml platforms.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2020-11-10 00:22:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2022-11-20 19:52:31.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.common 2023-12-15 20:29:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.common 2024-01-28 23:21:11.000000000 +0800
</span> @@ -1,5 +1,4 @@
OCAMLC=ocamlc
-OCAMLOPT=ocamlopt
OCAMLDEP=ocamldep
OCAMLMKLIB=ocamlmklib
OCAMLFIND=ocamlfind
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,39 +19,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,14 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include $(STDLIBDIR)/Makefile.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(NATIVE_COMPILER)" ""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# $(NATIVE_COMPILER) was added in 4.09: use $(ARCH) for 4.06-4.08
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(ARCH)" "none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NATIVE_COMPILER = false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-NATIVE_COMPILER = true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PROFILE=dev or PROFILE=release
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PROFILE ?= auto
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile 2023-12-15 20:29:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2024-01-28 23:27:14.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,15 +11,10 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- CAMLCFLAGS=-w +a-4-9-41-42-44-45-48 -warn-error A -bin-annot -g \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -safe-string -strict-sequence -strict-formats
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CAMLCFLAGS=-w +a-4-9-41-42-44-45-48 $(WARN_ERROR) -bin-annot -g \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -safe-string -strict-sequence -strict-formats -I +compiler-libs
</span> -CAMLOPTFLAGS=$(CAMLCFLAGS)
-ifeq "$(FLAMBDA)" "true"
-CAMLOPTFLAGS+=-O3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,9 +43,12 @@
</span> -CMXS=$(CMOS:.cmo=.cmx)
COBJS=bng.$(O) nat_stubs.$(O)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- all:: libnums.$(A) nums.cma
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MODULES_NUM_TOP=num_top_printers num_top
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,14 +25,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ all:: libnums.$(A) nums.cma num_top.cma META.legacy META.modern META.top \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ num-legacy.install num-modern.install
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq "$(ARCH)" "none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(NATIVE_COMPILER)" "true"
</span> -all:: nums.cmxa
-endif
-
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,9 +56,24 @@
</span> -all:: nums.cmxs
-endif
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libnums.$(A): $(COBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OCAMLMKLIB) -oc nums $(COBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ META.top: META.num-top.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ echo 'version = "$(VERSION)"' > $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat $^ >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -55,13 +42,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ' version = "$(VERSION)"' >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ' browse_interfaces = ""' >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ' archive(byte) = "nums.cma"' >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifneq "$(ARCH)" "none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo ' archive(native) = "nums.cmxa"' >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ' plugin(byte) = "nums.cma"' >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(NATDYNLINK)" "true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @echo ' plugin(native) = "nums.cmxs"' >> $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ')' >> $@
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ libnums.$(A): $(COBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,12 +51,6 @@
</span> nums.cma: $(CMOS)
$(OCAMLMKLIB) -o nums -oc nums -linkall $(CMOS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,10 +83,10 @@
</span> -nums.cmxs: nums.cmxa libnums.$(A)
- $(OCAMLOPT) $(CAMLOPTFLAGS) -I . -shared -o nums.cmxs nums.cmxa
-
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # We hard-code the C dependencies rather than having them generated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # because the dependencies are so simple.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bng.$(O): bng.h bng_*.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,8 +42,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ num_top.cma: $(CMOS_NUM_TOP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OCAMLC) $(CAMLCFLAGS) -a -o $@ $^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -88,8 +63,6 @@
</span> $(OCAMLC) $(CAMLCFLAGS) -c $*.mli
%.cmo: %.ml
$(OCAMLC) $(CAMLCFLAGS) -c $*.ml
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,48 +95,55 @@
</span> %.$(O): %.c
$(OCAMLC) -ccopt -DBNG_ARCH_$(BNG_ARCH) -c $*.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,12 +49,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,14 +70,7 @@
</span> # is installed via findlib
TOINSTALL=nums.cma libnums.$(A) $(CMIS) $(CMIS:.cmi=.mli) $(CMIS:.cmi=.cmti)
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq "$(ARCH)" "none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(NATIVE_COMPILER)" "true"
</span> -TOINSTALL+=nums.cmxa nums.$(A) $(CMXS)
-endif
-ifeq "$(NATDYNLINK)" "true"
<span style='display:block; white-space:pre;background:#ffe0e0;'>--TOINSTALL+=nums.cmxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-TOINSTALL_CMXS=nums.cmxs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TOINSTALL_CMXS=
</span> -endif
ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true"
TOINSTALL_STUBS=dllnums$(EXT_DLL)
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -111,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,9 +135,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OCAMLFIND) install num META
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f META
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DATA) $(TOINSTALL) $(DESTDIR)$(STDLIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(NATDYNLINK)" "true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(INSTALL_DLL) $(TOINSTALL_CMXS) $(DESTDIR)$(STDLIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DIR) $(DESTDIR)$(STDLIBDIR)/stublibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL_DLL) $(TOINSTALL_STUBS) $(DESTDIR)$(STDLIBDIR)/stublibs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -200,7 +163,7 @@
</span> endif
clean:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- rm -f *.cm[ioxta] *.cmx[as] *.cmti *.$(O) *.$(A) *$(EXT_DLL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ rm -f *.cm[ioxta] *.cmti *.$(O) *.$(A) *$(EXT_DLL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depend:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(OCAMLDEP) -slash *.mli *.ml > .depend
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- test/Makefile.orig 2020-11-10 00:22:09.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ test/Makefile 2022-11-20 19:42:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,11 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCAMLC=ocamlc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OCAMLOPT=ocamlopt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCAMLRUN=ocamlrun
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- rm -f *.cm[ioxta] *.cmx[as] *.cmti *.$(O) *.$(A) *$(EXT_DLL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ rm -f *.cm[ioxta] *.cmti *.$(O) *.$(A) *$(EXT_DLL) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ META.top META.legacy META.modern $(SOURCES_NUM_TOP) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ num-legacy.install num-modern.install
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- include $(shell $(OCAMLC) -where)/Makefile.config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- test/Makefile 2023-12-15 20:29:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ test/Makefile 2024-01-28 23:28:23.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,7 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include ../Makefile.common
</span>
CAMLCFLAGS=
-CAMLOPTFLAGS=$(CAMLCFLAGS)
FILES=test.ml test_nats.ml test_big_ints.ml test_ratios.ml test_nums.ml test_io.ml end_test.ml
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,24 +11,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,24 +8,13 @@
</span> @echo "----- Testing in bytecode..."
$(OCAMLRUN) -I ../src ./test.byt
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq "$(ARCH)" "none"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifeq "$(NATIVE_COMPILER)" "true"
</span> -all:: test.exe
- @echo "----- Testing in native code..."
- ./test.exe
</pre><pre style='margin:0'>
</pre>