rpms/ocaml/F-9 ocaml-3.10.1-map32bit.patch, NONE, 1.1 ocaml.spec, 1.38, 1.39
Richard W.M. Jones (rjones)
fedora-extras-commits at redhat.com
Thu May 8 11:14:40 UTC 2008
- Previous message (by thread): rpms/gnome-packagekit/devel .cvsignore, 1.16, 1.17 gnome-packagekit.spec, 1.29, 1.30 sources, 1.16, 1.17
- Next message (by thread): rpms/nfs-utils/devel nfs-utils-1.1.2-exportfs-man-typo.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-creds.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-des-types.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-getport.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-getverbose.patch, NONE, 1.1 nfs-utils-1.1.2-mount-bg-fix.patch, NONE, 1.1 nfs-utils-1.1.2-mount-chk-setuid.patch, NONE, 1.1 nfs-utils-1.1.2-mount-remove-bg-host.patch, NONE, 1.1 nfs-utils-1.1.2-mount-retry.patch, NONE, 1.1 nfs-utils-1.1.2-tcpwrapper-fix.patch, NONE, 1.1 nfs-utils.spec, 1.172, 1.173
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rjones
Update of /cvs/pkgs/rpms/ocaml/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9274
Modified Files:
ocaml.spec
Added Files:
ocaml-3.10.1-map32bit.patch
Log Message:
* Thu May 8 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.1-3
- Pass MAP_32BIT to mmap (bz #445545).
ocaml-3.10.1-map32bit.patch:
--- NEW FILE ocaml-3.10.1-map32bit.patch ---
diff -ur ocaml-3.10.1.orig/byterun/unix.c ocaml-3.10.1/byterun/unix.c
--- ocaml-3.10.1.orig/byterun/unix.c 2007-11-20 15:47:41.000000000 +0000
+++ ocaml-3.10.1/byterun/unix.c 2008-05-08 11:54:11.000000000 +0100
@@ -346,6 +346,10 @@
#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;
@@ -354,7 +358,7 @@
Assert (modulo < Page_size);
raw_mem = (char *) mmap(last_addr, 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;
last_addr = raw_mem + size + 2 * Page_size;
*block = raw_mem;
Index: ocaml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml/F-9/ocaml.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- ocaml.spec 29 Feb 2008 18:52:45 -0000 1.38
+++ ocaml.spec 8 May 2008 11:14:02 -0000 1.39
@@ -1,6 +1,6 @@
Name: ocaml
Version: 3.10.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Objective Caml compiler and programming environment
@@ -17,6 +17,7 @@
Patch1: ocaml-user-cflags.patch
Patch2: ocaml-3.10.0-tclver.patch
Patch3: ocaml-3.10.1-ppc64.patch
+Patch4: ocaml-3.10.1-map32bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel
BuildRequires: gdbm-devel
@@ -190,6 +191,7 @@
%patch1 -p1 -b .cflags
%patch2 -p1 -b .tclver
%patch3 -p1 -b .ppc64
+%patch4 -p1 -b .map32bit
cp %{SOURCE2} refman.pdf
@@ -431,6 +433,9 @@
%changelog
+* Thu May 8 2008 Richard W.M. Jones <rjones at redhat.com> - 3.10.1-3
+- Pass MAP_32BIT to mmap (bz #445545).
+
* Fri Feb 29 2008 David Woodhouse <dwmw2 at infradead.org> - 3.10.1-2
- ppc64 port
- Previous message (by thread): rpms/gnome-packagekit/devel .cvsignore, 1.16, 1.17 gnome-packagekit.spec, 1.29, 1.30 sources, 1.16, 1.17
- Next message (by thread): rpms/nfs-utils/devel nfs-utils-1.1.2-exportfs-man-typo.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-creds.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-des-types.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-getport.patch, NONE, 1.1 nfs-utils-1.1.2-gssd-getverbose.patch, NONE, 1.1 nfs-utils-1.1.2-mount-bg-fix.patch, NONE, 1.1 nfs-utils-1.1.2-mount-chk-setuid.patch, NONE, 1.1 nfs-utils-1.1.2-mount-remove-bg-host.patch, NONE, 1.1 nfs-utils-1.1.2-mount-retry.patch, NONE, 1.1 nfs-utils-1.1.2-tcpwrapper-fix.patch, NONE, 1.1 nfs-utils.spec, 1.172, 1.173
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list