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

- add back ocaml-ppc64.patch for ppc secondary arch, drop .cmxs files from file list on ppc (cherry picked from commit 52c1ade62f)

Browse Source
This commit is contained in:
Karsten Hopp 2011-12-19 18:02:08 +01:00 committed by Richard W.M. Jones
parent a334c49ca0
commit 4863fbd07c
2 changed files with 2097 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2083
ocaml-ppc64.patch Normal file
View File

File diff suppressed because it is too large Load Diff

17
ocaml.spec
View File

@ -2,7 +2,7 @@
Name: ocaml Name: ocaml
Version: 3.12.1 Version: 3.12.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Objective Caml compiler and programming environment Summary: Objective Caml compiler and programming environment
@ -27,6 +27,9 @@ Patch1: ocaml-user-cflags.patch
# Patch from Debian for ARM (sent upstream). # Patch from Debian for ARM (sent upstream).
Patch3: debian_patches_0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch Patch3: debian_patches_0013-ocamlopt-arm-add-.type-directive-for-code-symbols.patch
# Non-upstream patch to build on ppc64.
Patch4: ocaml-ppc64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Depend on previous version of OCaml so that ocamlobjinfo # Depend on previous version of OCaml so that ocamlobjinfo
@ -63,13 +66,13 @@ Provides: ocaml(compiler) = %{version}
# backend is only available on a subset of architectures. # backend is only available on a subset of architectures.
ExclusiveArch: alpha %{arm} %{ix86} ia64 x86_64 ppc sparc sparcv9 ppc64 ExclusiveArch: alpha %{arm} %{ix86} ia64 x86_64 ppc sparc sparcv9 ppc64
%ifarch alpha %{arm} %{ix86} ia64 ppc sparc sparcv9 x86_64 %ifarch alpha %{arm} %{ix86} ia64 ppc ppc64 sparc sparcv9 x86_64
%global native_compiler 1 %global native_compiler 1
%else %else
%global native_compiler 0 %global native_compiler 0
%endif %endif
%ifarch %{ix86} sparc sparcv9 x86_64 %ifarch %{ix86} ppc64 sparc sparcv9 x86_64
%global natdynlink 1 %global natdynlink 1
%else %else
%global natdynlink 0 %global natdynlink 0
@ -219,6 +222,9 @@ man pages and info files.
%patch0 -p1 -b .rpath %patch0 -p1 -b .rpath
%patch1 -p1 -b .cflags %patch1 -p1 -b .cflags
%patch3 -p1 -b .arm-type-dir %patch3 -p1 -b .arm-type-dir
%ifarch ppc ppc64
%patch4 -p1 -b .ppc64
%endif
cp %{SOURCE2} refman.pdf cp %{SOURCE2} refman.pdf
@ -486,6 +492,11 @@ fi
%changelog %changelog
* Thu Jan 12 2012 Richard W.M. Jones <rjones@redhat.com> 3.12.1-2
- add back ocaml-ppc64.patch for ppc secondary arch, drop .cmxs files
from file list on ppc (cherry picked from F16 - this should have
gone into Rawhide originally then been cherry picked back to F16)
* Fri Jan 6 2012 Richard W.M. Jones <rjones@redhat.com> - 3.12.1-1 * Fri Jan 6 2012 Richard W.M. Jones <rjones@redhat.com> - 3.12.1-1
- New upstream version 3.12.1. This is a bugfix update. - New upstream version 3.12.1. This is a bugfix update.