rpms/apron
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add -ppl1 patch to adapt to PPL 1.0 + GMP 5.1.0.

Browse Source 
Update -mlgmpidl12 patch to fix more problems.
This commit is contained in:
Jerry James 2013-02-14 11:15:40 -07:00
parent b5de54a7f6
commit 6aa9fe5d4f
3 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
apron-mlgmpidl12.patch
View File

@ -1,5 +1,75 @@
--- ./mlapronidl/apron_caml.c.orig 2009-09-11 12:00:29.000000000 -0600
+++ ./mlapronidl/apron_caml.c 2013-02-14 10:26:50.578327765 -0700
@@ -5,6 +5,7 @@
/* This file is part of the APRON Library, released under LGPL license.
Please read the COPYING file packaged in the distribution */
+#include <caml/camlidlruntime.h>
#include "apron_caml.h"
/* ********************************************************************** */
@@ -83,7 +84,8 @@ struct custom_operations camlidl_apron_c
camlidl_apron_linexpr0_ptr_compare,
camlidl_apron_linexpr0_ptr_hash,
custom_serialize_default,
- custom_deserialize_default
+ custom_deserialize_default,
+ custom_compare_ext_default
};
/* ********************************************************************** */
@@ -117,7 +119,8 @@ struct custom_operations camlidl_apron_c
camlidl_apron_texpr0_ptr_compare,
camlidl_apron_texpr0_ptr_hash,
custom_serialize_default,
- custom_deserialize_default
+ custom_deserialize_default,
+ custom_compare_ext_default
};
/* ********************************************************************** */
@@ -148,7 +151,8 @@ struct custom_operations camlidl_apron_c
camlidl_apron_manager_ptr_compare,
custom_hash_default,
custom_serialize_default,
- custom_deserialize_default
+ custom_deserialize_default,
+ custom_compare_ext_default
};
void camlidl_apron_manager_check_exception(struct ap_manager_t* man, void* _ctx)
@@ -261,7 +265,8 @@ struct custom_operations camlidl_apron_c
camlidl_apron_abstract0_ptr_compare,
camlidl_apron_abstract0_ptr_hash,
camlidl_apron_abstract0_serialize,
- camlidl_apron_abstract0_deserialize
+ camlidl_apron_abstract0_deserialize,
+ custom_compare_ext_default
};
/* ********************************************************************** */
@@ -316,7 +321,8 @@ struct custom_operations camlidl_apron_c
camlidl_apron_var_ptr_compare,
camlidl_apron_var_ptr_hash,
custom_serialize_default,
- custom_deserialize_default
+ custom_deserialize_default,
+ custom_compare_ext_default
};
/* ********************************************************************** */
@@ -356,7 +362,8 @@ struct custom_operations camlidl_apron_c
camlidl_apron_environment_ptr_compare,
camlidl_apron_environment_ptr_hash,
custom_serialize_default,
- custom_deserialize_default
+ custom_deserialize_default,
+ custom_compare_ext_default
};
value camlidl_apron_environment_ptr_c2ml(ap_environment_ptr* p)
--- ./mlapronidl/scalar.ml.orig 2009-12-22 06:43:20.000000000 -0700
+++ ./mlapronidl/scalar.ml 2012-05-10 09:52:30.119999946 -0600
+++ ./mlapronidl/scalar.ml 2013-02-14 10:26:22.182358360 -0700
@@ -89,7 +89,7 @@ match scalar with
| Mpfrf x ->
let y = Mpfr.init2 (Mpfr.get_prec x) in

11
apron-ppl1.patch Normal file
View File

@ -0,0 +1,11 @@
--- ppl/ppl_user.cc.orig 2009-12-22 06:33:18.000000000 -0700
+++ ppl/ppl_user.cc 2013-02-14 09:26:53.821600343 -0700
@@ -320,7 +320,7 @@
exact = false;
}
/* singleton */
- else r.insert(Constraint(Variable(i)==temp));
+ else r.insert(Constraint(Variable(i)==mpz_class(temp)));
}
return exact;
}

7
apron.spec
View File

@ -23,6 +23,8 @@ Patch0: %{name}-weak.patch
Patch1: %{name}-mlgmpidl12.patch
# Not yet sent upstream. Fix the tests for GCC 4.7.1.
Patch2: %{name}-test.patch
# Not yet sent upstream. Adapt to PPL 1.0 + GMP 5.1.0
Patch3: %{name}-ppl1.patch
BuildRequires: mpfr-devel
BuildRequires: ppl-devel
@ -82,6 +84,7 @@ Development files for the Ocaml interface to the APRON library.
%patch0
%patch1
%patch2
%patch3
# Set the configuration values
sed -e "s|^# HAS_CPP.*|HAS_CPP = 1|" \
@ -244,6 +247,10 @@ done
%endif
%changelog
* Thu Feb 14 2013 Jerry James <loganjerry@gmail.com> - 0.9.10-11
- Add -ppl1 patch to adapt to PPL 1.0 + GMP 5.1.0
- Update -mlgmpidl12 patch to fix more problems
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.10-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild