- Since oasis 0.4.7 bytecode has no stublibs anymore

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-pcre?expand=0&rev=42
This commit is contained in:
Olaf Hering 2017-07-19 09:28:15 +00:00 committed by Git OBS Bridge
parent 621be7eebe
commit 8a432f5625
2 changed files with 20 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 17 20:24:18 UTC 2017 - ohering@suse.de
- Since oasis 0.4.7 bytecode has no stublibs anymore
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de

View File

@ -38,8 +38,9 @@ BuildRequires: ocaml >= 3.10.2
BuildRequires: ocaml-oasis BuildRequires: ocaml-oasis
BuildRequires: ocaml-ocamldoc BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-rpm-macros >= 4.03 BuildRequires: ocaml-rpm-macros >= 4.03
BuildRequires: pcre-devel BuildRequires: pkg-config
BuildRequires: ocamlfind(bytes) BuildRequires: ocamlfind(bytes)
BuildRequires: pkgconfig(libpcre)
%description %description
Perl compatibile regular expressions (PCRE) for OCaml. Perl compatibile regular expressions (PCRE) for OCaml.
@ -61,6 +62,14 @@ developing applications that use %{name}.
%patch0 -p1 %patch0 -p1
%build %build
sed -i~ "
s@\(.*\)\(CCOpt:\)\(.*\)\$@\1\2 %{optflags} -fPIC `pkg-config --cflags libpcre`@
s@\(.*\)\(CCLib:\)\(.*\)\$@\1\2 `pkg-config --libs libpcre`@
" _oasis
if diff -u _oasis~ _oasis
then
exit 1
fi
%oasis_setup %oasis_setup
%ocaml_oasis_configure --enable-docs %ocaml_oasis_configure --enable-docs
%ocaml_oasis_build %ocaml_oasis_build
@ -69,26 +78,28 @@ developing applications that use %{name}.
%install %install
%ocaml_oasis_findlib_install %ocaml_oasis_findlib_install
# #
%if 0%{?ocaml_native_compiler}
mkdir -vp %{buildroot}/etc/ld.so.conf.d/ mkdir -vp %{buildroot}/etc/ld.so.conf.d/
tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
%{_libdir}/ocaml/stublibs %{_libdir}/ocaml/pcre
_EOF_ _EOF_
# #
%post -p /sbin/ldconfig %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%endif
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc COPYING.txt README.md %doc COPYING.txt README.md
/etc/ld.so.conf.d/*.conf
%dir %{_libdir}/ocaml %dir %{_libdir}/ocaml
%dir %{_libdir}/ocaml/* %dir %{_libdir}/ocaml/*
%if 0%{?ocaml_native_compiler} %if 0%{?ocaml_native_compiler}
%{_libdir}/ocaml/*/*.cmxs %{_libdir}/ocaml/*/*.cmxs
%endif
%{_libdir}/ocaml/*/*.so %{_libdir}/ocaml/*/*.so
/etc/ld.so.conf.d/*.conf
%endif
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)