[rpms/apron] rawhide: OCaml 5.5.0 rebuild

public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed

From: Jerry James <loganjerry@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/apron] rawhide: OCaml 5.5.0 rebuild
Date: Thu, 09 Jul 2026 18:06:37 GMT	[thread overview]
Message-ID: <178362039718.1.5799746671859485346.rpms-apron-fef9d64ab5aa@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/apron
            Branch : rawhide
            Commit : fef9d64ab5aa2e86a42fa451db615e9935ce533d
            Author : Jerry James <loganjerry@gmail.com>
            Date   : 2026-07-09T12:06:17-06:00
            Stats  : +215/-3 in 3 file(s)
            URL    : https://src.fedoraproject.org/rpms/apron/c/fef9d64ab5aa2e86a42fa451db615e9935ce533d?branch=rawhide

            Log:
            OCaml 5.5.0 rebuild

- Pass -ldopt prior to linker arguments when invoking ocamlmklib

---
diff --git a/apron-csdp.patch b/apron-csdp.patch
index 887fa46..d026d33 100644
--- a/apron-csdp.patch
+++ b/apron-csdp.patch
@@ -6,8 +6,8 @@
  
 -LIBS = -lapron -lgmpxx -lmpfr -lgmp -lm
 -LIBS_DEBUG = -lapron_debug -lgmpxx -lmpfr -lgmp -lm
-+LIBS = -Wl,--as-needed -lapron -lsdp -lgmpxx -lmpfr -lgmp -lm
-+LIBS_DEBUG = -Wl,--as-needed -lapron_debug -lsdp -lgmpxx -lmpfr -lgmp -lm
++LIBS = -lapron -lsdp -lgmpxx -lmpfr -lgmp -lm
++LIBS_DEBUG = -lapron_debug -lsdp -lgmpxx -lmpfr -lgmp -lm
  
  #---------------------------------------
  # Rules

diff --git a/apron-ldopt.patch b/apron-ldopt.patch
new file mode 100644
index 0000000..b68b1d2
--- /dev/null
+++ b/apron-ldopt.patch
@@ -0,0 +1,210 @@
+--- avoct/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ avoct/Makefile	2026-07-05 19:03:09.807445082 -0600
+@@ -306,10 +306,10 @@ avo%.d.cmxa avo%.d.a: avo.cmx libavo%_ca
+ 	$(OCAMLMKLIB) -o avo$*.d -oc avo$*_caml_debug avo.cmx -lavo$*_debug $(LIBS_DEBUG)
+ 
+ dllavo%_caml.$(EXT_DLL) libavo%_caml.a: avo_caml.o libavo%.a
+-	$(OCAMLMKLIB) -o avo$*_caml $< -L. -lavo$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o avo$*_caml $< -L. -lavo$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllavo%_caml_debug.$(EXT_DLL) libavo%_caml_debug.a: avo_caml_debug.o libavo%_debug.a
+-	$(OCAMLMKLIB) -o avo$*_caml_debug $< -L. -lavo$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o avo$*_caml_debug $< -L. -lavo$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ %.ml %.mli %_caml.c: %.idl perlscript_c.pl perlscript_caml.pl ../mlapronidl/*.idl
+ 	mkdir -p tmp
+--- box/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ box/Makefile	2026-07-05 19:03:39.007165653 -0600
+@@ -185,10 +185,10 @@ libbox%_debug.$(EXT_DLL): $(subst .c,%_d
+ #---------------------------------------
+ 
+ dllbox%_caml.$(EXT_DLL) libbox%_caml.a: box_caml.o libbox%.a
+-	$(OCAMLMKLIB) -o box$*_caml $< -L. -lbox$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o box$*_caml $< -L. -lbox$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllbox%_caml_debug.$(EXT_DLL) libbox%_caml_debug.a: box_caml_debug.o libbox%_debug.a
+-	$(OCAMLMKLIB) -o box$*_caml_debug $< -L. -lbox$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o box$*_caml_debug $< -L. -lbox$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ box_caml.o: box_caml.c
+ 	$(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $<
+--- fppol/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ fppol/Makefile	2026-07-05 19:04:31.870437275 -0600
+@@ -301,19 +301,19 @@ endif
+ #	$(OCAMLC) -noautolink $(OCAMLFLAGS) $(OCAMLINC) -o $@ -make-runtime bigarray.cma gmp.cma apron.cma fpp.cma -ccopt "-L. -L../mlapronidl $(LDFLAGS)" -cclib "-lfpp_caml -lfpp$* -lapron_caml -lapron -lgmp_caml -lmpfr -lgmp -lglpk -lbigarray -lcamlidl"
+ 
+ fpp%.cma: fpp.cmo libfpp%_caml.a libfpp%.a
+-	$(OCAMLMKLIB) -o fpp$* -oc fpp$*_caml fpp.cmo -lfpp$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o fpp$* -oc fpp$*_caml fpp.cmo -lfpp$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ fpp%.cmxa fpp%.a: fpp.cmx libfpp%_caml.a libfpp%.a
+-	$(OCAMLMKLIB) -o fpp$* -oc fpp$*_caml fpp.cmx -lfpp$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o fpp$* -oc fpp$*_caml fpp.cmx -lfpp$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ fpp%.d.cmxa fpp%.d.a: fpp.cmx libfpp%_caml_debug.a libfpp%_debug.a
+-	$(OCAMLMKLIB) -o fpp$*.d -oc fpp$*_caml_debug fpp.cmx -lfpp$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o fpp$*.d -oc fpp$*_caml_debug fpp.cmx -lfpp$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ dllfpp%_caml.$(EXT_DLL) libfpp%_caml.a: fpp_caml.o libfpp%.a
+-	$(OCAMLMKLIB) -o fpp$*_caml $< -L. -lfpp$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o fpp$*_caml $< -L. -lfpp$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllfpp%_caml_debug.$(EXT_DLL) libfpp%_caml_debug.a: fpp_caml_debug.o libfpp%_debug.a
+-	$(OCAMLMKLIB) -o fpp$*_caml_debug $< -L. -lfpp$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o fpp$*_caml_debug $< -L. -lfpp$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ %.ml %.mli %_caml.c: %.idl perlscript_c.pl perlscript_caml.pl ../mlapronidl/*.idl
+ 	mkdir -p tmp
+--- mlapronidl/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ mlapronidl/Makefile	2026-07-05 19:05:04.822078494 -0600
+@@ -130,10 +130,10 @@ apron.d.a: apron.cmx libapron_caml_debug
+ dllapron_caml.$(EXT_DLL): libapron_caml.a
+ 
+ libapron_caml.a: $(CCMODULES:%=%.o)
+-	$(OCAMLMKLIB) $(CCMODULES:%=%.o) $(LDFLAGS) $(LIBS) -o apron_caml
++	$(OCAMLMKLIB) $(CCMODULES:%=%.o) -ldopt '$(LDFLAGS)' $(LIBS) -o apron_caml
+ 
+ libapron_caml_debug.a: $(CCMODULES:%=%_debug.o)
+-	$(OCAMLMKLIB) $(CCMODULES:%=%_debug.o) $(LDFLAGS) $(LIBS_DEBUG) -o apron_caml_debug
++	$(OCAMLMKLIB) $(CCMODULES:%=%_debug.o) -ldopt '$(LDFLAGS)' $(LIBS_DEBUG) -o apron_caml_debug
+ 
+ #---------------------------------------
+ # CAML rules
+--- newpolka/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ newpolka/Makefile	2026-07-05 19:05:54.117788218 -0600
+@@ -93,10 +93,10 @@ mlRll: dllpolkaRll_caml.$(EXT_DLL)
+ endif
+ 
+ test0%: test0%_debug.o libpolka%_debug.a
+-	$(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ $< -L. -lpolka$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ $< -L. -lpolka$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ test1%: test1%_debug.o libpolka%_debug.a
+-	$(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ $< -L. -lpolka$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(CC) $(CFLAGS_DEBUG) $(ICFLAGS) -o $@ $< -L. -lpolka$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ mlexample%.byte: mlexample.ml box%.cma
+ 	$(OCAMLC) $(OCAMLFLAGS) -I $(MLGMPIDL_LIB) -I $(APRON_LIB) -o $@ bigarray.cma gmp.cma apron.cma box$*.cma $<
+@@ -208,10 +208,10 @@ test.cmo: test.ml
+ #---------------------------------------
+ 
+ dllpolka%_caml.$(EXT_DLL) libpolka%_caml.a: polka_caml.o libpolka%.a
+-	$(OCAMLMKLIB) -o polka$*_caml $< -L. -lpolka$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o polka$*_caml $< -L. -lpolka$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ libpolka%_caml_debug.a: polka_caml_debug.o libpolka%_debug.a
+-	$(OCAMLMKLIB) -o polka$*_caml_debug $< -L. -lpolka$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o polka$*_caml_debug $< -L. -lpolka$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ #---------------------------------------
+ # OCaml rules
+--- octagons/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ octagons/Makefile	2026-07-05 19:06:19.581215952 -0600
+@@ -305,10 +305,10 @@ oct%.d.cmxa oct%.d.a: oct.cmx liboct%_ca
+ 	$(OCAMLMKLIB) -o oct$*.d -oc oct$*_caml_debug oct.cmx -loct$*_debug $(LIBS_DEBUG)
+ 
+ dlloct%_caml.$(EXT_DLL) liboct%_caml.a: oct_caml.o liboct%.a
+-	$(OCAMLMKLIB) -o oct$*_caml $< -L. -loct$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o oct$*_caml $< -L. -loct$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dlloct%_caml_debug.$(EXT_DLL) liboct%_caml_debug.a: oct_caml_debug.o liboct%_debug.a
+-	$(OCAMLMKLIB) -o oct$*_caml_debug $< -L. -loct$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o oct$*_caml_debug $< -L. -loct$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ %.ml %.mli %_caml.c: %.idl perlscript_c.pl perlscript_caml.pl ../mlapronidl/*.idl
+ 	mkdir -p tmp
+--- pplite/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ pplite/Makefile	2026-07-05 19:07:41.892197489 -0600
+@@ -184,11 +184,11 @@ endif
+ 
+ dllap_pplite_caml.$(EXT_DLL): libap_pplite_caml.a
+ libap_pplite_caml.a: ap_pplite_caml.o libap_pplite.a
+-	$(OCAMLMKLIB) -o ap_pplite_caml $< -L. -lap_pplite $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o ap_pplite_caml $< -L. -lap_pplite -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllap_pplite_caml_debug.$(EXT_DLL): libap_pplite_caml_debug.a
+ libap_pplite_caml_debug.a: ap_pplite_caml_debug.o libap_pplite_debug.a
+-	$(OCAMLMKLIB) -o ap_pplite_caml_debug $< -L. -lap_pplite_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o ap_pplite_caml_debug $< -L. -lap_pplite_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ pplite.cma: pplite.cmo libap_pplite_caml.a libap_pplite.a
+ 	$(OCAMLMKLIB) -o pplite -oc ap_pplite_caml pplite.cmo -lap_pplite $(LIBS)
+--- ppl/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ ppl/Makefile	2026-07-05 19:07:11.228300425 -0600
+@@ -185,22 +185,22 @@ endif
+ 
+ dllap_ppl_caml.$(EXT_DLL): libap_ppl_caml.a
+ libap_ppl_caml.a: ap_ppl_caml.o libap_ppl.a
+-	$(OCAMLMKLIB) -o ap_ppl_caml $< -L. -lap_ppl $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o ap_ppl_caml $< -L. -lap_ppl -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllap_ppl_caml_debug.$(EXT_DLL): libap_ppl_caml_debug.a
+ libap_ppl_caml_debug.a: ap_ppl_caml_debug.o libap_ppl_debug.a
+-	$(OCAMLMKLIB) -o ap_ppl_caml_debug $< -L. -lap_ppl_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o ap_ppl_caml_debug $< -L. -lap_ppl_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ ppl.cma: ppl.cmo libap_ppl_caml.a libap_ppl.a
+-	$(OCAMLMKLIB) -o ppl -oc ap_ppl_caml ppl.cmo -lap_ppl $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o ppl -oc ap_ppl_caml ppl.cmo -lap_ppl -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ ppl.cmxa: ppl.a
+ ppl.a: ppl.cmx libap_ppl_caml.a libap_ppl.a
+-	$(OCAMLMKLIB) -o ppl -oc ap_ppl_caml ppl.cmx -lap_ppl $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o ppl -oc ap_ppl_caml ppl.cmx -lap_ppl -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ ppl.d.cmxa: ppl.d.a
+ ppl.d.a: ppl.cmx libap_ppl_caml_debug.a libap_ppl_debug.a
+-	$(OCAMLMKLIB) -o ppl.d -oc ap_ppl_caml_debug ppl.cmx -lap_ppl_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o ppl.d -oc ap_ppl_caml_debug ppl.cmx -lap_ppl_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ 
+ #---------------------------------------
+--- products/Makefile.orig	2024-06-07 09:36:08.000000000 -0600
++++ products/Makefile	2026-07-05 19:08:44.747526632 -0600
+@@ -142,26 +142,26 @@ OCAMLMKLIB := $(OCAMLMKLIB) -ocamlc "$(O
+ 
+ dllpolkaGrid_caml.$(EXT_DLL): libpolkaGrid_caml.a
+ libpolkaGrid_caml.a: polkaGrid_caml.o libap_pkgrid.a
+-	$(OCAMLMKLIB) -o polkaGrid_caml $< -L. -lap_pkgrid -L../newpolka -lpolkaMPQ $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o polkaGrid_caml $< -L. -lap_pkgrid -L../newpolka -lpolkaMPQ -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllpolkaGrid_caml_debug.$(EXT_DLL): libpolkaGrid_caml_debug.a
+ libpolkaGrid_caml_debug.a: polkaGrid_caml_debug.o libap_pkgrid_debug.a
+-	$(OCAMLMKLIB) -o polkaGrid_caml_debug $< -L. -lap_pkgrid_debug -L../newpolka -lpolkaMPQ_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o polkaGrid_caml_debug $< -L. -lap_pkgrid_debug -L../newpolka -lpolkaMPQ_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ #---------------------------------------
+ # ML rules
+ #---------------------------------------
+ 
+ polkaGrid.cma: polkaGrid.cmo libpolkaGrid_caml.a libap_pkgrid.a
+-	$(OCAMLMKLIB) -o polkaGrid -oc polkaGrid_caml polkaGrid.cmo -lap_pkgrid $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o polkaGrid -oc polkaGrid_caml polkaGrid.cmo -lap_pkgrid -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ polkaGrid.cmxa: polkaGrid.a
+ polkaGrid.a: polkaGrid.cmx libpolkaGrid_caml.a libap_pkgrid.a
+-	$(OCAMLMKLIB) -o polkaGrid -oc polkaGrid_caml polkaGrid.cmx -lap_pkgrid $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o polkaGrid -oc polkaGrid_caml polkaGrid.cmx -lap_pkgrid -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ polkaGrid.d.cmxa: polkaGrid.d.a
+ polkaGrid.d.a: polkaGrid.cmx libpolkaGrid_caml_debug.a libap_pkgrid_debug.a
+-	$(OCAMLMKLIB) -o polkaGrid.d -oc polkaGrid_caml_debug polkaGrid.cmx -lap_pkgrid_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o polkaGrid.d -oc polkaGrid_caml_debug polkaGrid.cmx -lap_pkgrid_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ #---------------------------------------
+ # IDL rules
+--- taylor1plus/Makefile.orig	2026-07-05 19:00:50.025329083 -0600
++++ taylor1plus/Makefile	2026-07-05 19:09:13.802923630 -0600
+@@ -217,10 +217,10 @@ libt1p%_debug.$(EXT_DLL): $(subst .c,%_d
+ #---------------------------------------
+ 
+ dllt1p%_caml.$(EXT_DLL) libt1p%_caml.a: t1p_caml.o libt1p%.a
+-	$(OCAMLMKLIB) -o t1p$*_caml t1p_caml.o -L. -lt1p$* $(LDFLAGS) $(LIBS)
++	$(OCAMLMKLIB) -o t1p$*_caml t1p_caml.o -L. -lt1p$* -ldopt '$(LDFLAGS)' $(LIBS)
+ 
+ dllt1p%_caml_debug.$(EXT_DLL) libt1p%_caml_debug.a: t1p_caml_debug.o libt1p%_debug.a
+-	$(OCAMLMKLIB) -o t1p$*_caml_debug t1p_caml_debug.o -L. -lt1p$*_debug $(LDFLAGS) $(LIBS_DEBUG)
++	$(OCAMLMKLIB) -o t1p$*_caml_debug t1p_caml_debug.o -L. -lt1p$*_debug -ldopt '$(LDFLAGS)' $(LIBS_DEBUG)
+ 
+ t1p_caml.o: t1p_caml.c
+ 	$(CC) $(CFLAGS) $(ICFLAGS) -DNUM_MPQ -c -o $@ $<

diff --git a/apron.spec b/apron.spec
index c45903d..b34f591 100644
--- a/apron.spec
+++ b/apron.spec
@@ -45,6 +45,8 @@ Patch5:         %{name}-flint.patch
 # Prevent segfaults in the OCaml garbage collector
 # https://github.com/antoinemine/apron/pull/112
 Patch6:         %{name}-ocaml-gc.patch
+# Pass -ldopt prior to linker arguments when invoking ocamlmklib
+Patch7:         %{name}-ldopt.patch
 
 # OCaml packages not built on i686 since OCaml 5 / Fedora 39.
 ExcludeArch:    %{ix86}
@@ -80,7 +82,7 @@ BuildRequires:  tex(tabu.sty)
 BuildRequires:  tex(ulem.sty)
 BuildRequires:  texinfo-tex
 
-%global sover %(cut -d. -f 1 <<< %{version})
+%global sover   %{gsub %version ^(%d*)%..*$ %1}
 
 # Do not Require symbols we do not Provide
 %global __ocaml_requires_opts -i Coeff -i Dim -i Interval -i Lincons0 -i Linexpr0 -i Scalar -i Tcons0 -i Texpr0

                 reply	other threads:[~2026-07-09 18:06 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178362039718.1.5799746671859485346.rpms-apron-fef9d64ab5aa@fedoraproject.org \
    --to=loganjerry@gmail.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox