New upstream version 1.18.1.
- Include a fix for use of uint32, sent upstream. - ocaml-4.02.1 rebuild.
This commit is contained in:
parent
5887e1572c
commit
379adb5bb8
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
ocamlgsl-0.6.0.tar.gz
|
||||
/gsl-ocaml-1.13.0.tar.gz
|
||||
/gsl-ocaml-1.17.2.tar.gz
|
||||
/gsl-ocaml-1.18.1.tar.gz
|
||||
|
49
0001-lib-io.h-Use-uint32_t-from-stdint.patch
Normal file
49
0001-lib-io.h-Use-uint32_t-from-stdint.patch
Normal file
@ -0,0 +1,49 @@
|
||||
From cfc5e509f6a7403771a5a8aa27120fccd6718784 Mon Sep 17 00:00:00 2001
|
||||
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||||
Date: Tue, 17 Feb 2015 15:22:23 +0000
|
||||
Subject: [PATCH] lib/io.h: Use uint32_t from stdint.
|
||||
|
||||
In OCaml > 4.02, the caml/*.h headers no longer define illegal types
|
||||
such as uint32. See this link for rationale:
|
||||
http://caml.inria.fr/mantis/view.php?id=6517
|
||||
|
||||
Therefore you can't rely on these types being available in code using
|
||||
these header files any longer.
|
||||
|
||||
Change the gsl code to use the C99 standard header <stdint.h> and the
|
||||
uint32_t type instead.
|
||||
---
|
||||
lib/io.h | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/io.h b/lib/io.h
|
||||
index 0be4377..e2c2a62 100644
|
||||
--- a/lib/io.h
|
||||
+++ b/lib/io.h
|
||||
@@ -18,6 +18,8 @@
|
||||
#ifndef GSL_CAML_IO_H
|
||||
#define GSL_CAML_IO_H
|
||||
|
||||
+#include <stdint.h>
|
||||
+
|
||||
#include <caml/misc.h>
|
||||
#include <caml/mlvalues.h>
|
||||
|
||||
@@ -82,12 +84,12 @@ CAMLextern value caml_alloc_channel(struct channel *chan);
|
||||
|
||||
CAMLextern int caml_flush_partial (struct channel *);
|
||||
CAMLextern void caml_flush (struct channel *);
|
||||
-CAMLextern void caml_putword (struct channel *, uint32);
|
||||
+CAMLextern void caml_putword (struct channel *, uint32_t);
|
||||
CAMLextern int caml_putblock (struct channel *, char *, intnat);
|
||||
CAMLextern void caml_really_putblock (struct channel *, char *, intnat);
|
||||
|
||||
CAMLextern unsigned char caml_refill (struct channel *);
|
||||
-CAMLextern uint32 caml_getword (struct channel *);
|
||||
+CAMLextern uint32_t caml_getword (struct channel *);
|
||||
CAMLextern int caml_getblock (struct channel *, char *, intnat);
|
||||
CAMLextern int caml_really_getblock (struct channel *, char *, intnat);
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
@ -1,14 +1,17 @@
|
||||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
|
||||
Name: ocaml-gsl
|
||||
Version: 1.17.2
|
||||
Release: 8%{?dist}
|
||||
Version: 1.18.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Interface to GSL (GNU scientific library) for OCaml
|
||||
License: GPLv2
|
||||
|
||||
URL: https://mmottl.github.io/gsl-ocaml/
|
||||
Source0: https://github.com/mmottl/gsl-ocaml/releases/download/v%{version}/gsl-ocaml-%{version}.tar.gz
|
||||
|
||||
# Send upstream on 2015-02-17.
|
||||
Patch1: 0001-lib-io.h-Use-uint32_t-from-stdint.patch
|
||||
|
||||
ExcludeArch: armv7hl sparc64 s390 s390x
|
||||
|
||||
BuildRequires: ocaml >= 3.07
|
||||
@ -38,6 +41,8 @@ developing applications that use %{name}.
|
||||
%prep
|
||||
%setup -q -n gsl-ocaml-%{version}
|
||||
|
||||
%patch1 -p1
|
||||
|
||||
|
||||
%build
|
||||
make
|
||||
@ -74,7 +79,9 @@ make install
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.17.2-8
|
||||
* Tue Feb 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1.18.1-1
|
||||
- New upstream version 1.18.1.
|
||||
- Include a fix for use of uint32, sent upstream.
|
||||
- ocaml-4.02.1 rebuild.
|
||||
|
||||
* Sun Aug 31 2014 Richard W.M. Jones <rjones@redhat.com> - 1.17.2-7
|
||||
|
Loading…
Reference in New Issue
Block a user