rebuilt with recent gcc and --with-pic [release 4.09.0-4mamba;Mon Dec 30 2019]

This commit is contained in:
Silvan Calarco 2024-01-06 07:48:56 +01:00
parent 6bc28dedb1
commit 66a6265071
3 changed files with 56 additions and 51 deletions

Binary file not shown.

BIN
ocaml-4.09-refman.pdf Normal file

Binary file not shown.

View File

@ -1,8 +1,8 @@
%define majorminor %(echo %version | cut -d. -f 1-2)
Name: ocaml
Version: 4.07.1
Release: 3mamba
Version: 4.09.0
Release: 4mamba
Summary: The OCaml compiler and programming environment
Group: Applications/Development
Vendor: openmamba
@ -20,8 +20,8 @@ BuildRequires: libX11-devel
BuildRequires: libbinutils-devel
## AUTOBUILDREQ-END
BuildRequires: emacs-nox
BuildRequires: ocaml-runtime >= %{?epoch:%epoch:}%{version}
BuildRequires: libgdbm-devel
BuildRequires: libbinutils-devel >= 2.33.1
Requires: %{name}-runtime = %{?epoch:%epoch:}%{version}-%{release}
Requires: gcc
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -61,7 +61,7 @@ This package provides in particular the following tools:
%package runtime
Group: Applications/Development
Summary: OCaml runtime environment
Provides: ocaml(runtime)
Provides: ocaml(runtime) = %{?epoch:%epoch:}%{version}-%{release}
%description runtime
This package contains the runtime environment needed to run OCaml bytecode.
@ -148,22 +148,28 @@ Obsoletes: %{name}-manual
OCaml is a general-purpose programming language, designed with program safety and reliability in mind.
This package contains documentation in PDF and HTML format as well as man pages and info files.
%debug_package
%prep
%setup -q -a2 -a3
cp %{S:1} refman.pdf
%build
./configure \
-host %{_host} \
%ifnarch arm
-cc "gcc ${RPM_OPT_FLAGS}" \
%endif
-bindir %{_bindir} \
-libdir %{_libdir}/ocaml \
-mandir %{_mandir}/man1
%configure \
--libdir=%{_libdir}/ocaml \
--with-pic
#./configure \
# -host %{_host} \
#%ifnarch arm
# -cc "gcc ${RPM_OPT_FLAGS}" \
#%endif
# -bindir %{_bindir} \
# -libdir %{_libdir}/ocaml \
# -mandir %{_mandir}/man1
%make -j1 world.opt
%make -j1 -C emacs ocamltags
#% make -j1 -C emacs ocamltags
%make -j1 -C ocamldoc all
%install
@ -172,12 +178,12 @@ cp %{S:1} refman.pdf
%makeinstall \
LIBDIR=%{_libdir}/ocaml \
cd emacs
%makeinstall \
BINDIR=%{buildroot}%{_bindir} \
EMACSDIR=%{buildroot}%{_datadir}/emacs/site-lisp
make install-ocamltags BINDIR=%{buildroot}%{_bindir}
cd ..
#cd emacs
#%makeinstall \
# BINDIR=%{buildroot}%{_bindir} \
# EMACSDIR=%{buildroot}%{_datadir}/emacs/site-lisp
#make install-ocamltags BINDIR=%{buildroot}%{_bindir}
#cd ..
mkdir -p %{buildroot}%{_infodir}
cd infoman
@ -217,8 +223,6 @@ exit 0
%{_bindir}/ocamlobjinfo.byte
%{_bindir}/ocamlobjinfo.opt
%{_bindir}/ocamlopt.byte
%{_bindir}/ocamloptp.byte
%{_bindir}/ocamloptp.opt
%{_bindir}/ocamlprof.byte
%{_bindir}/ocamlprof.opt
%{_bindir}/ocamlrund
@ -234,7 +238,9 @@ exit 0
%{_bindir}/ocamlobjinfo
%{_bindir}/ocamlopt
%{_bindir}/ocamlopt.opt
%{_bindir}/ocamloptp
#%{_bindir}/ocamloptp
#%{_bindir}/ocamloptp.byte
#%{_bindir}/ocamloptp.opt
%{_bindir}/ocamlprof
%{_bindir}/ocamlyacc
%{_bindir}/ocaml-instr-graph
@ -253,7 +259,6 @@ exit 0
%{_libdir}/ocaml/*.o
%{_libdir}/ocaml/*.ml
%{_libdir}/ocaml/*.mli
%exclude %{_libdir}/ocaml/graphicsX11.mli
%{_libdir}/ocaml/libcamlrun_shared.so
%{_libdir}/ocaml/libasmrun_shared.so
%{_libdir}/ocaml/objinfo_helper
@ -261,17 +266,15 @@ exit 0
%ifarch x86_64
%{_libdir}/ocaml/stublibs/dllraw_spacetime_lib.so
%endif
%{_libdir}/ocaml/vmthreads/*.a
%{_libdir}/ocaml/vmthreads/*.mli
#%{_libdir}/ocaml/vmthreads/*.a
#%{_libdir}/ocaml/vmthreads/*.mli
%{_libdir}/ocaml/threads/*.a
%{_libdir}/ocaml/threads/*.cmx
%{_libdir}/ocaml/threads/*.cmxa
%{_libdir}/ocaml/caml
%{_libdir}/ocaml/target_camlheaderd
%{_libdir}/ocaml/target_camlheaderi
#%{_libdir}/ocaml/ocamlbuild
%{_libdir}/ocaml/camlheaderd
%{_libdir}/ocaml/camlheaderi
%{_mandir}/man1/ocaml.*
#%{_mandir}/man1/ocamlbuild.*
%{_mandir}/man1/ocamlc.*
%{_mandir}/man1/ocamlcp.*
%{_mandir}/man1/ocamldebug.*
@ -290,38 +293,34 @@ exit 0
%{_libdir}/ocaml/VERSION
%{_libdir}/ocaml/*.cmo
%{_libdir}/ocaml/*.cmi
%exclude %{_libdir}/ocaml/graphicsX11.cmi
%{_libdir}/ocaml/*.cma
%{_libdir}/ocaml/*.cmt
%{_libdir}/ocaml/*.cmti
%dir %{_libdir}/ocaml/stublibs
%{_libdir}/ocaml/stublibs/dllbigarray.so
#%{_libdir}/ocaml/stublibs/dllbigarray.so
%{_libdir}/ocaml/stublibs/dllcamlstr.so
%{_libdir}/ocaml/stublibs/dllgraphics.so
#%{_libdir}/ocaml/stublibs/dllnums.so
#%{_libdir}/ocaml/stublibs/dllgraphics.so
##%{_libdir}/ocaml/stublibs/dllnums.so
%{_libdir}/ocaml/stublibs/dllthreads.so
%{_libdir}/ocaml/stublibs/dllunix.so
%{_libdir}/ocaml/stublibs/dllvmthreads.so
#%{_libdir}/ocaml/stublibs/dllvmthreads.so
%dir %{_libdir}/ocaml/threads
%{_libdir}/ocaml/threads/*.cmi
%{_libdir}/ocaml/threads/*.cmti
%{_libdir}/ocaml/threads/*.cma
%dir %{_libdir}/ocaml/vmthreads
%{_libdir}/ocaml/vmthreads/*.cmi
%{_libdir}/ocaml/vmthreads/*.cmti
%{_libdir}/ocaml/vmthreads/*.cma
%{_libdir}/ocaml/threads/*.mli
%{_mandir}/man1/ocamlrun.*
%files x11
%defattr(-,root,root)
%{_libdir}/ocaml/graphicsX11.cmi
%{_libdir}/ocaml/graphicsX11.mli
#%files x11
#%defattr(-,root,root)
#%{_libdir}/ocaml/graphicsX11.cmi
#%{_libdir}/ocaml/graphicsX11.mli
%files emacs
%defattr(-,root,root)
%{_datadir}/emacs/site-lisp/*
%{_bindir}/ocamltags
#%doc emacs/README
#%files emacs
#%defattr(-,root,root)
#%{_datadir}/emacs/site-lisp/*
#%{_bindir}/ocamltags
##%doc emacs/README
%files ocamldoc
%defattr(-,root,root)
@ -337,11 +336,17 @@ exit 0
#%doc refman.pdf htmlman
%changelog
* Sun Nov 24 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.07.1-3mamba
- ocaml-runtime: provide ocaml(runtime)
* Mon Dec 30 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.09.0-4mamba
- rebuilt with recent gcc and --with-pic
* Sat Nov 23 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.07.1-2mamba
- rebuilt with libbinutils-devel 2.33.1
* Fri Nov 22 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.09.0-3mamba
- ocaml-runtime: add provide ocaml(runtime)
* Fri Nov 22 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.09.0-2mamba
- rebuilt with ocaml-runtime 4.09.0 to fix requirement on previous version
* Fri Nov 15 2019 Automatic Build System <autodist@mambasoft.it> 4.09.0-1mamba
- automatic version update by autodist
* Thu Apr 25 2019 Automatic Build System <autodist@mambasoft.it> 4.07.1-1mamba
- automatic version update by autodist