Compare commits

...

42 Commits
f24 ... rawhide

Author SHA1 Message Date
Richard W.M. Jones
be40febedd OCaml 4.12.0 build 2021-03-01 11:02:45 +00:00
Fedora Release Engineering
6861d08bef - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 22:02:14 +00:00
Richard W.M. Jones
152920c078 Build ocamlrpcgen as native code.
Enable stripping.
Enable LTO (RHBZ#1915570).
2021-01-14 12:34:41 +00:00
Richard W.M. Jones
89b9dc8cb6 New upstream version 4.1.8.
Disable LTO (RHBZ#1915570).
2021-01-13 09:11:33 +00:00
Richard W.M. Jones
9e23a46d76 Bump release and rebuild. 2021-01-13 08:50:53 +00:00
Tom Stellard
878563436c Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-07 06:17:00 +00:00
Richard W.M. Jones
3b3bce04b8 OCaml 4.11.1 rebuild 2020-09-01 20:33:13 +01:00
Richard W.M. Jones
ed2e790f96 OCaml 4.11.0 rebuild 2020-08-21 12:23:23 +01:00
Fedora Release Engineering
3ee6e2f187 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 12:14:20 +00:00
Richard W.M. Jones
e9f1a1dbf6 OCaml 4.11.0+dev2-2020-04-22 rebuild 2020-05-05 00:00:57 +01:00
Richard W.M. Jones
48b24ca011 OCaml 4.11.0 pre-release attempt 2 2020-04-21 19:49:11 +01:00
Richard W.M. Jones
6524045f08 OCaml 4.11.0 pre-release 2020-04-17 21:35:35 +01:00
Richard W.M. Jones
868d2971e0 Update all OCaml dependencies for RPM 4.16. 2020-04-02 23:08:13 +01:00
Richard W.M. Jones
16c8071f34 OCaml 4.10.0 final. 2020-02-26 14:17:15 +00:00
Fedora Release Engineering
447c62c3e7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 19:40:45 +00:00
Richard W.M. Jones
2bbc36054f Fixes for OCaml 4.10. 2020-01-19 16:38:10 +00:00
Richard W.M. Jones
34f8b8dc83 OCaml 4.10.0+beta1 rebuild. 2020-01-19 16:14:23 +00:00
Richard W.M. Jones
8e6f5b1114 Bump and rebuild (RHBZ#1770380). 2019-11-08 20:58:02 +00:00
Richard W.M. Jones
fff925c5be Remove camlp4 dependency. 2019-07-27 21:24:16 +01:00
Fedora Release Engineering
f9ade6c0f6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 22:57:11 +00:00
Fedora Release Engineering
b25e786f9c - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 16:54:10 +00:00
Fedora Release Engineering
656e7b1fd7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 14:46:08 +00:00
Richard W.M. Jones
39fbc1b302 OCaml 4.07.0 (final) rebuild. 2018-07-11 14:18:14 +01:00
Richard W.M. Jones
e04eae4e2c OCaml 4.07.0-rc1 rebuild. 2018-06-19 22:12:03 +01:00
Richard W.M. Jones
d7d4c5f084 New upstream version 4.1.6.
- Remove upstream patch.
2018-05-15 14:32:25 +01:00
Fedora Release Engineering
904d534b7d - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 08:54:39 +00:00
Richard W.M. Jones
d4507a597d New upstream version 4.1.5. 2017-12-12 10:46:35 +00:00
Richard W.M. Jones
de3a1765bd New upstream version 4.1.4. 2017-11-08 16:26:54 +00:00
Richard W.M. Jones
a351710826 Bump release and rebuild. 2017-11-08 16:16:10 +00:00
Richard W.M. Jones
1580d44d94 Bump release and rebuild. 2017-11-08 15:28:27 +00:00
Richard W.M. Jones
b9bb0bc279 OCaml 4.06.0 rebuild. 2017-11-07 23:11:11 +00:00
Richard W.M. Jones
c07923eec3 New upstream version 4.1.3. 2017-08-07 19:44:42 +01:00
Richard W.M. Jones
b48d00420d OCaml 4.05.0 rebuild. 2017-08-07 19:13:44 +01:00
Fedora Release Engineering
9d187e083c - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:17:58 +00:00
Fedora Release Engineering
2c820de845 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 01:29:57 +00:00
Richard W.M. Jones
78080ce77e Bump release and rebuild. 2017-06-26 21:39:09 +01:00
Richard W.M. Jones
f626b6ad55 OCaml 4.04.2 rebuild. 2017-06-26 18:26:25 +01:00
Richard W.M. Jones
af6e67fe82 Bump release and rebuild. 2017-05-12 08:22:49 +01:00
Richard W.M. Jones
b5c78b71f6 Bump release and rebuild. 2017-05-11 21:21:20 +01:00
Richard W.M. Jones
ffc4ad190a OCaml 4.04.1 rebuild. 2017-05-11 18:48:23 +01:00
Fedora Release Engineering
e7c344e556 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 00:33:57 +00:00
Richard W.M. Jones
f2bbd6acc4 New upstream version 4.1.2. 2016-11-05 08:52:14 +00:00
4 changed files with 177 additions and 28 deletions

10
.gitignore vendored
View File

@ -1,9 +1 @@
ocamlnet-2.2.9.tar.gz
/ocamlnet-3.4.tar.gz
/ocamlnet-3.4.1.tar.gz
/ocamlnet-3.5.1.tar.gz
/ocamlnet-3.7.3.tar.gz
/ocamlnet-3.7.4.tar.gz
/ocamlnet-4.0.1.tar.gz
/ocamlnet-4.0.3.tar.gz
/ocamlnet-4.0.4.tar.gz
/ocamlnet-*.tar.gz

View File

@ -0,0 +1,45 @@
From 828a873df2b838e46faa5700dbae18601cb8dcb9 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 14 Jan 2021 12:20:03 +0000
Subject: [PATCH] Build ocamlrpcgen as native code.
---
code/src/rpc-generator/Makefile | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/code/src/rpc-generator/Makefile b/code/src/rpc-generator/Makefile
index e0ed4f5..a475e83 100644
--- a/code/src/rpc-generator/Makefile
+++ b/code/src/rpc-generator/Makefile
@@ -6,9 +6,11 @@ PKGNAME = rpc-generator
ARCHIVE = rpc_generator
OBJECTS = config.cmo syntax.cmo options.cmo parser.cmo lexer.cmo rename.cmo \
generate.cmo direct.cmo
+XOBJECTS = config.cmx syntax.cmx options.cmx parser.cmx lexer.cmx rename.cmx \
+ generate.cmx direct.cmx
DOBJECTS =
-ALL_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
+OPT_EXTRA = ocamlrpcgen$(EXEC_SUFFIX) rpcgen-packlist
PACKLIST = rpcgen-packlist
@@ -21,12 +23,12 @@ PP_OPTIONS = -pp "$(CPPO) $(PP_BYTES) $(PP_DEPRECATED)"
include $(TOP_DIR)/Makefile.rules
-ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cma main.cmo
+ocamlrpcgen$(EXEC_SUFFIX): $(ARCHIVE).cmxa main.cmx
rm -f ocamlrpcgen ocamlrpcgen$(EXEC_SUFFIX)
OCAMLPATH="..$(PATH_SEP)$$OCAMLPATH" \
- $(OCAMLC) -custom -o ocamlrpcgen \
+ $(OCAMLOPT) -o ocamlrpcgen \
-package unix,netstring,$(REGEXP_PROVIDER) \
- $(ARCHIVE).cma main.cmo -linkpkg
+ $(ARCHIVE).cmxa main.cmx -linkpkg
rpcgen-packlist:
echo $(BINDIR)/ocamlrpcgen >rpcgen-packlist
--
2.28.0.rc2

View File

@ -1,16 +1,5 @@
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
# Prevent RPM from stripping the binaries & debuginfo.
#
# NB: Only required because this package uses the obsolete -custom
# parameter and builds a bytecode 'ocamlrpcgen'. I tried to fix the
# build to make a native code 'ocamlrpcgen' but the build system got
# the better of me.
%global debug_package %{nil}
%global __strip /bin/true
Name: ocaml-ocamlnet
Version: 4.0.4
Version: 4.1.8
Release: 4%{?dist}
Summary: Network protocols for OCaml
License: BSD
@ -18,10 +7,12 @@ License: BSD
URL: http://projects.camlcity.org/projects/ocamlnet.html
Source0: http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
# Build ocamlrpcgen as native code. Sent upstream 2021-01-14.
Patch1: 0001-Build-ocamlrpcgen-as-native-code.patch
BuildRequires: make
BuildRequires: ocaml >= 3.12.1-3
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-labltk-devel
@ -111,6 +102,7 @@ files for developing applications that use %{name}-nethttpd.
%prep
%setup -q -n ocamlnet-%{version}
%patch1 -p2
%build
@ -129,9 +121,16 @@ unset MAKEFLAGS
-enable-tcl \
-enable-zip
# This is a hack caused by the ocamlrpcgen patch. Because "make all"
# no longer builds ocamlrpcgen (it is now built by "make opt") but
# some other parts of the build depend on this program, we have to run
# make opt first and ignore the result. Hopefully we'll get a better
# result when upstream integrate the patch. RWMJ 2021-01.
make opt ||:
make all
%if %opt
%ifarch %{ocaml_native_compiler}
make opt
%endif
@ -175,7 +174,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%{_libdir}/ocaml/rpc-auth-local
%{_libdir}/ocaml/rpc-generator
%{_libdir}/ocaml/shell
%if %opt
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/*.a
%exclude %{_libdir}/ocaml/*/*.cmxa
%exclude %{_libdir}/ocaml/*/*.cmx
@ -192,7 +191,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%files devel
%doc ChangeLog RELNOTES
%if %opt
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmxa
%{_libdir}/ocaml/*/*.cmx
@ -204,7 +203,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%files nethttpd
%doc ChangeLog RELNOTES
%{_libdir}/ocaml/nethttpd
%if %opt
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/*.a
%exclude %{_libdir}/ocaml/*/*.cmxa
%endif
@ -213,7 +212,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%files nethttpd-devel
%doc ChangeLog RELNOTES
%if %opt
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmxa
%endif
@ -221,6 +220,119 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%changelog
* Mon Mar 1 11:02:44 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-4
- OCaml 4.12.0 build
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.8-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Jan 14 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-2
- Build ocamlrpcgen as native code.
- Enable stripping.
- Enable LTO (RHBZ#1915570).
* Wed Jan 13 2021 Richard W.M. Jones <rjones@redhat.com> - 4.1.8-1
- New upstream version 4.1.8.
- Disable LTO (RHBZ#1915570).
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-18
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-17
- OCaml 4.11.0 rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-15
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-14
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-13
- OCaml 4.11.0 pre-release
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-12
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-11
- OCaml 4.10.0 final.
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-9
- OCaml 4.10.0+beta1 rebuild.
* Fri Nov 08 2019 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-8
- Bump and rebuild (RHBZ#1770380).
* Sat Jul 27 2019 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-7
- Remove camlp4 dependency.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-3
- OCaml 4.07.0 (final) rebuild.
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-2
- OCaml 4.07.0-rc1 rebuild.
* Tue May 15 2018 Richard W.M. Jones <rjones@redhat.com> - 4.1.6-1
- New upstream version 4.1.6.
- Remove upstream patch.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Dec 12 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.5-1
- New upstream version 4.1.5.
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.4-1
- New upstream version 4.1.4.
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.3-2
- OCaml 4.06.0 rebuild.
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.3-1
- New upstream version 4.1.3.
- OCaml 4.05.0 rebuild.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-7
- Bump release and rebuild.
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-6
- OCaml 4.04.2 rebuild.
* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-5
- Bump release and rebuild.
* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-4
- Bump release and rebuild.
* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-3
- OCaml 4.04.1 rebuild.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 4.1.2-1
- New upstream version 4.1.2.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1 +1 @@
3196b85e1e329bfb0665f54723e0dffb ocamlnet-4.0.4.tar.gz
SHA512 (ocamlnet-4.1.8.tar.gz) = e238235968b9546c60568a38e68e354378d30e7137973332dcb10da21fa775ab7b367889fc51f5bd7cb00e51582834cafe2a0c4706b0bc77a44d4571a6f22815