rpms/ocaml/F-8 ocaml-3.10.0-map32bit.patch, NONE, 1.1 ocaml.spec, 1.35, 1.36

[Richard W.M. Jones (rjones)]

Author: rjones

Update of /cvs/pkgs/rpms/ocaml/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12268

Modified Files:
	ocaml.spec 
Added Files:
	ocaml-3.10.0-map32bit.patch 
Log Message:
* Sun Jul 13 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-8
- Pass MAP_32BIT to mmap (bz #454384).


ocaml-3.10.0-map32bit.patch:

--- NEW FILE ocaml-3.10.0-map32bit.patch ---
diff -ur ocaml-3.10.0.orig/byterun/unix.c ocaml-3.10.0/byterun/unix.c
--- ocaml-3.10.0.orig/byterun/unix.c	2007-02-12 07:57:25.000000000 +0000
+++ ocaml-3.10.0/byterun/unix.c	2008-07-13 21:44:06.000000000 +0100
@@ -346,13 +346,17 @@
 
 #include <sys/mman.h>
 
+#ifndef MAP_32BIT /* Fedora bug 445545 */
+#define MAP_32BIT 0
+#endif
+
 char *caml_aligned_mmap (asize_t size, int modulo, void **block)
 {
   char *raw_mem;
   uintnat aligned_mem;
   Assert (modulo < Page_size);
   raw_mem = (char *) mmap(NULL, size + Page_size, PROT_READ | PROT_WRITE,
-                          MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+                          MAP_32BIT | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
   if (raw_mem == MAP_FAILED) return NULL;
   *block = raw_mem;
   raw_mem += modulo;                /* Address to be aligned */
Only in ocaml-3.10.0/byterun: unix.c.orig


Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/F-8/ocaml.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ocaml.spec	25 Oct 2007 16:12:46 -0000	1.35
+++ ocaml.spec	13 Jul 2008 21:04:36 -0000	1.36
@@ -1,6 +1,6 @@
 Name:		ocaml
 Version:	3.10.0
-Release: 	7%{?dist}
+Release: 	8%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
@@ -15,6 +15,7 @@
 Source5:	ocaml-find-provides.sh
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
+Patch2:         ocaml-3.10.0-map32bit.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	ncurses-devel
 BuildRequires:  gdbm-devel
@@ -186,6 +187,7 @@
 %setup -q -T -D -a 3
 %patch0 -p1
 %patch1 -p1 -b .cflags
+%patch2 -p1 -b .map32bit
 
 cp %{SOURCE2} refman.pdf
 
@@ -427,6 +429,9 @@
 
 
 %changelog
+* Sun Jul 13 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-8
+- Pass MAP_32BIT to mmap (bz #454384).
+
 * Thu Sep  6 2007 Richard W.M. Jones <rjones at redhat.com> - 3.10.0-7
 - Run chrpath to delete rpaths used on some of the stublibs.
 - Ignore Parsetree module in dependency calculation.