rpms/ocaml
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Run chrpath to delete rpaths used on some of the stublibs.

Browse Source 
- Ignore Parsetree module in dependency calculation.
- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
    over-match module names.
This commit is contained in:
Richard W.M. Jones 2007-09-06 11:49:59 +00:00
parent 34cb4f24e6
commit 25069bf74e
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ocaml-find-provides.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh - #!/bin/sh -
# OCaml-specific "find-provides" for RPM. # OCaml-specific "find-provides" for RPM.
# By Richard W.M. Jones <rjones@redhat.com> # By Richard W.M. Jones <rjones@redhat.com>
# $Id: ocaml-find-provides.sh,v 1.7 2007/06/11 15:03:17 rjones Exp $ # $Id: ocaml-find-provides.sh,v 1.1 2007/07/02 15:13:39 gemi Exp $
#set -x #set -x
@ -56,7 +56,7 @@ ignore_modules_re=`echo $ignore_modules | sed 's/ /|/g'`
# Get a list of the modules these file(s) provide. # Get a list of the modules these file(s) provide.
$OCAMLOBJINFO $files | $OCAMLOBJINFO $files |
grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' | grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
grep -E "$modules_re" | grep -E '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
while read md5sum module; do while read md5sum module; do
echo "ocaml($module) = $md5sum" echo "ocaml($module) = $md5sum"
done | done |

4
ocaml-find-requires.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh - #!/bin/sh -
# OCaml-specific "find-requires" for RPM. # OCaml-specific "find-requires" for RPM.
# By Richard W.M. Jones <rjones@redhat.com> # By Richard W.M. Jones <rjones@redhat.com>
# $Id: ocaml-find-requires.sh,v 1.1 2007/07/02 15:13:39 gemi Exp $ # $Id: ocaml-find-requires.sh,v 1.2 2007/09/03 14:35:10 rjones Exp $
#set -x #set -x
@ -58,7 +58,7 @@ ignore_modules_re=`echo $ignore_modules | sed 's/ /|/g'`
# Get a list of the modules these file(s) depend on. # Get a list of the modules these file(s) depend on.
$OCAMLOBJINFO $files | $OCAMLOBJINFO $files |
grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' | grep -Eo '[0-9a-f]{32}[[:space:]]+[A-Za-z0-9_]+' |
grep -Ev "$modules_re" | grep -Ev '[0-9a-f]{32}[[:space:]]+'"($modules_re)\$" |
while read md5sum module; do while read md5sum module; do
echo "ocaml($module) = $md5sum" echo "ocaml($module) = $md5sum"
done | done |

14
ocaml.spec
View File

@ -1,6 +1,6 @@
Name: ocaml Name: ocaml
Version: 3.10.0 Version: 3.10.0
Release: 6%{?dist} Release: 7%{?dist}
Summary: Objective Caml compiler and programming environment Summary: Objective Caml compiler and programming environment
@ -35,6 +35,7 @@ BuildRequires: libXrender-devel
BuildRequires: libXt-devel BuildRequires: libXt-devel
BuildRequires: mesa-libGL-devel BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel BuildRequires: mesa-libGLU-devel
BuildRequires: chrpath
Requires: gcc Requires: gcc
Requires: ncurses-devel Requires: ncurses-devel
Requires: gdbm-devel Requires: gdbm-devel
@ -189,7 +190,7 @@ man pages and info files.
cp %{SOURCE2} refman.pdf cp %{SOURCE2} refman.pdf
%define _use_internal_dependency_generator 0 %define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -c -f %{buildroot}%{_bindir}/ocamlobjinfo %define __find_requires %{SOURCE4} -i Asttypes -i Outcometree -i Cmo_format -i Parsetree -c -f %{buildroot}%{_bindir}/ocamlobjinfo
%define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo %define __find_provides %{SOURCE5} -f %{buildroot}%{_bindir}/ocamlobjinfo
%build %build
@ -238,6 +239,9 @@ cp %{SOURCE5} $RPM_BUILD_ROOT/usr/lib/rpm/
echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release echo %{version} > $RPM_BUILD_ROOT%{_libdir}/ocaml/fedora-ocaml-release
# Remove rpaths from stublibs .so files.
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -423,6 +427,12 @@ fi
%changelog %changelog
* Thu Sep 6 2007 Richard W.M. Jones <rjones@redhat.com> - 3.10.0-7
- Run chrpath to delete rpaths used on some of the stublibs.
- Ignore Parsetree module in dependency calculation.
- Fixed ocaml-find-{requires,provides}.sh regexp calculation so it doesn't
over-match module names.
* Mon Sep 3 2007 Richard W.M. Jones <rjones@redhat.com> - 3.10.0-6 * Mon Sep 3 2007 Richard W.M. Jones <rjones@redhat.com> - 3.10.0-6
- ocaml-runtime provides ocaml(runtime) = 3.10.0, and - ocaml-runtime provides ocaml(runtime) = 3.10.0, and
ocaml-find-requires.sh modified so that it adds this requires ocaml-find-requires.sh modified so that it adds this requires