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/ocaml-perl4caml] rawhide: OCaml 5.5.0 rebuild
Date: Thu, 09 Jul 2026 15:22:03 GMT [thread overview]
Message-ID: <178361052355.1.1548196868650451973.rpms-ocaml-perl4caml-d587bca5a196@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/ocaml-perl4caml
Branch : rawhide
Commit : d587bca5a196d4d3c1230741fb950dd09c0f4495
Author : Jerry James <loganjerry@gmail.com>
Date : 2026-07-09T09:21:22-06:00
Stats : +37/-2 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/ocaml-perl4caml/c/d587bca5a196d4d3c1230741fb950dd09c0f4495?branch=rawhide
Log:
OCaml 5.5.0 rebuild
- Add patch to use -ldopt/-cclib as needed
---
diff --git a/ocaml-perl4caml.spec b/ocaml-perl4caml.spec
index 8e3c1bd..76064d9 100644
--- a/ocaml-perl4caml.spec
+++ b/ocaml-perl4caml.spec
@@ -3,7 +3,7 @@ ExcludeArch: %{ix86}
Name: ocaml-perl4caml
Version: 0.9.5
-Release: 119%{?dist}
+Release: 120%{?dist}
Summary: OCaml library for calling Perl libraries and code
License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
@@ -19,6 +19,9 @@ Patch: perl4caml-0.9.5-svtrv.patch
# Upstream patch to fix build for OCaml 4.04.
Patch: perl4caml-0.9.5-fix-use-of-camlparam-etc-macros.patch
+# Patch to fix build for OCaml 5.5.0
+Patch: perl4caml-0.9.5-c-linker-options.patch
+
# Upstream patch to fix argv declaration for GCC 14:
Patch: 0001-perl_c.c-Fix-declaration-of-argv.patch
@@ -30,7 +33,7 @@ BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros
BuildRequires: perl-devel >= 5.8
-BuildRequires: perl-generators
+BuildRequires: perl-interpreter
BuildRequires: perl(ExtUtils::Embed)
# Perl4caml provides type-safe wrappers for these Perl modules:
@@ -133,6 +136,10 @@ install -c -m 0755 dllperl4caml.so $DESTDIR/%{_libdir}/ocaml/stublibs
%changelog
+* Thu Jul 09 2026 Jerry James <loganjerry@gmail.com> - 0.9.5-120
+- OCaml 5.5.0 rebuild
+- Add patch to use -ldopt/-cclib as needed
+
* Fri Feb 20 2026 Richard W.M. Jones <rjones@redhat.com> - 0.9.5-119
- OCaml 5.4.1 rebuild
diff --git a/perl4caml-0.9.5-c-linker-options.patch b/perl4caml-0.9.5-c-linker-options.patch
new file mode 100644
index 0000000..c1a8c3b
--- /dev/null
+++ b/perl4caml-0.9.5-c-linker-options.patch
@@ -0,0 +1,28 @@
+OCaml 5.5 requires:
+ the use of -ldopt before passing C linker options to ocamlmklib
+ the use of -cclib before passing C linker options to ocamlopt
+
+--- a/Makefile
++++ b/Makefile
+@@ -74,10 +74,10 @@ WRAPPERS := \
+ all: perl4caml.cma perl4caml.cmxa META all-examples html
+
+ perl4caml.cma: perl.cmo perl_c.o $(WRAPPERS)
+- $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
++ $(OCAMLMKLIB) -o perl4caml -ldopt '$(LIBPERL)' $^
+
+ perl4caml.cmxa: perl.cmx perl_c.o $(WRAPPERS:.cmo=.cmx)
+- $(OCAMLMKLIB) -o perl4caml $(LIBPERL) $^
++ $(OCAMLMKLIB) -o perl4caml -ldopt '$(LIBPERL)' $^
+
+ all-examples: examples/test.bc examples/loadpage.bc examples/google.bc \
+ examples/test.opt examples/loadpage.opt examples/google.opt \
+@@ -112,7 +112,7 @@ run-tests:
+ $(OCAMLC) $(OCAMLCFLAGS) perl4caml.cma $^ -o $@
+
+ %.opt: %.cmx
+- $(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. perl4caml.cmxa \
++ $(OCAMLOPT) $(OCAMLOPTFLAGS) -cclib -L. -cclib '$(LIBPERL)' perl4caml.cmxa \
+ $(DYNALOADER_HACK) $^ -o $@
+
+ %.cmi: %.mli
reply other threads:[~2026-07-09 15:22 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=178361052355.1.1548196868650451973.rpms-ocaml-perl4caml-d587bca5a196@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