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