- Add swig-fix_ocaml_type.patch to change the declaration of

caml_array_length to match that in ocaml's header.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/swig?expand=0&rev=48
This commit is contained in:
Philipp Thomas 2013-03-28 11:01:12 +00:00 committed by Git OBS Bridge
parent 9535c6a376
commit c5762fc53a
3 changed files with 34 additions and 1 deletions

24
swig-fix_ocaml_type.patch Normal file
View File

@ -0,0 +1,24 @@
From: Philipp Thomas <pth@suse.de>
Date: 2013-03-27 15:47:28+01:00
Subject: Fix return type of caml_array_length
caml_array_type changed to mlsize_t, so fix the declaration.
---
Lib/ocaml/ocamldec.swg | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: Lib/ocaml/ocamldec.swg
===================================================================
--- Lib/ocaml/ocamldec.swg.orig 2012-09-07 08:06:00.000000000 +0200
+++ Lib/ocaml/ocamldec.swg 2013-03-27 15:46:36.135652282 +0100
@@ -130,7 +130,7 @@ CAMLextern int64 Int64_val(caml_value_t
SWIGSTATIC CAML_VALUE caml_array_new( int n );
SWIGSTATIC void caml_array_set( CAML_VALUE arr, int n, CAML_VALUE item );
SWIGSTATIC CAML_VALUE caml_array_nth( CAML_VALUE arr, int n );
- SWIGSTATIC int caml_array_length( CAML_VALUE arr );
+ SWIGSTATIC mlsize_t caml_array_length( CAML_VALUE arr );
SWIGSTATIC CAML_VALUE caml_val_char( char c );
SWIGSTATIC CAML_VALUE caml_val_uchar( unsigned char c );

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 28 11:56:54 CET 2013 - pth@suse.de
- Add swig-fix_ocaml_type.patch to change the declaration of
caml_array_length to match that in ocaml's header.
-------------------------------------------------------------------
Thu Dec 20 09:40:06 UTC 2012 - kkaempf@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package swig
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -33,6 +33,8 @@ Patch6: 0008-Ruby-Disable-broken-tests.patch
Patch7: 0012-Python-Disable-broken-test-in-threads_exception.patch
# Test fails in openSUSE 12.1 only
Patch8: skip-python-li_std_containers_int.patch
# Fix the return type in declaration of caml_array_length
Patch9: swig-fix_ocaml_type.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: boost-devel
@ -134,6 +136,7 @@ understandig SWIG usage.
%patch8 -p1
%endif
%patch7 -p1
%patch9
%build
%configure --disable-ccache