[packages/ocaml-net] - rel 3, fix tcl detection

baggins baggins at pld-linux.org
Sun Apr 26 00:53:12 CEST 2026


commit 2d0b4585278b6e0b9aedef13847c6d0157f4f405
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 26 02:52:48 2026 +0200

    - rel 3, fix tcl detection

 gcc15.patch    | 25 +++++++++++++++++++++++++
 ocaml-net.spec |  4 +++-
 2 files changed, 28 insertions(+), 1 deletion(-)
---
diff --git a/ocaml-net.spec b/ocaml-net.spec
index 3cb333a..4d34e4c 100644
--- a/ocaml-net.spec
+++ b/ocaml-net.spec
@@ -14,7 +14,7 @@ Summary:	Modules for Internet programming in OCaml
 Summary(pl.UTF-8):	Moduły ułatwiające pisanie programów internetowych w OCamlu
 Name:		ocaml-net
 Version:	4.1.9
-Release:	2
+Release:	3
 License:	GPL v2+ (nethttpd), LGPL v2+ (mod_netcgi), BSD-like (the rest)
 Group:		Libraries
 Source0:	http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
@@ -22,6 +22,7 @@ Source0:	http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
 Patch0:		%{name}-buildfix.patch
 Patch1:		%{name}-lablgtk2.patch
 Patch2:		%{name}-apache-link.patch
+Patch3:		gcc15.patch
 URL:		http://projects.camlcity.org/projects/ocamlnet.html
 %if %{with apache}
 BuildRequires:	%{apache}
@@ -755,6 +756,7 @@ używających biblioteki shell.
 %patch -P0 -p1
 %patch -P1 -p1
 %patch -P2 -p1
+%patch -P3 -p1
 
 %build
 # no %%configure, please
diff --git a/gcc15.patch b/gcc15.patch
new file mode 100644
index 0000000..d19ae4b
--- /dev/null
+++ b/gcc15.patch
@@ -0,0 +1,25 @@
+--- ocamlnet-4.1.9/configure~	2026-04-26 02:30:13.000000000 +0200
++++ ocamlnet-4.1.9/configure	2026-04-26 02:45:44.833341071 +0200
+@@ -829,7 +829,8 @@
+     cat <<EOF >tmp/t.c
+ #include "tcl.h"
+ 
+-main () {
++int main () {
++return 0;
+ }
+ EOF
+ 
+@@ -850,10 +850,10 @@
+ #include <stdio.h>
+ #include "tcl.h"
+ 
+-do_something () {
++int do_something () {
+     void (*x)(int);
+     x = Tcl_Exit;
+-    exit(0);
++    return 0;
+ }
+ EOF
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ocaml-net.git/commitdiff/2d0b4585278b6e0b9aedef13847c6d0157f4f405



More information about the pld-cvs-commit mailing list