[Pkg-ocaml-maint-commits] [apron] 01/02: Fix build with GCC 5 by not defining strdup

[Mehdi Dogguy]

This is an automated email from the git hooks/post-receive script.

mehdi pushed a commit to branch master
in repository apron.

commit 46fe52a2e9096efd74c38466eb4d1fa73c26916c
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jan 17 23:20:33 2016 +0100

    Fix build with GCC 5 by not defining strdup
---
 debian/changelog                              |  8 +++++++
 debian/patches/0009-Don-t-define-strdup.patch | 31 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d873d6c..32898de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apron (0.9.10-7) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix build with GCC 5 by not defining strdup (Closes: #808628).
+    - Add patch 0009-Don-t-define-strdup.patch
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 17 Jan 2016 23:19:46 +0100
+
 apron (0.9.10-6) unstable; urgency=low
 
   [ Stéphane Glondu ]
diff --git a/debian/patches/0009-Don-t-define-strdup.patch b/debian/patches/0009-Don-t-define-strdup.patch
new file mode 100644
index 0000000..78dff04
--- /dev/null
+++ b/debian/patches/0009-Don-t-define-strdup.patch
@@ -0,0 +1,31 @@
+From: Mehdi Dogguy <mehdi at debian.org>
+Date: Sun, 17 Jan 2016 23:19:29 +0100
+Subject: Don't define strdup
+
+---
+ apron/apron/ap_config.h | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/apron/apron/ap_config.h b/apron/apron/ap_config.h
+index 7a28451..636871a 100644
+--- a/apron/apron/ap_config.h
++++ b/apron/apron/ap_config.h
+@@ -23,17 +23,6 @@ static const bool false = 0;
+ static const bool true  = 1;
+ #endif
+ 
+-#if !(defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED || defined __APPLE__ || defined __CYGWIN__)
+-
+-static inline char* strdup(const char* s){
+-  char* s2;
+-
+-  s2 = malloc(strlen(s)+1);
+-  strcpy(s2,s);
+-  return s2;
+-}
+-#endif
+-
+ #ifdef __cplusplus
+ }
+ #endif
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 131c395..3314d04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-Remove-references-to-obsolete-mpfr_random.patch
 0007-Fix-rounding-mode-check-in-assert.patch
 0008-Fix-build-failure-with-ppl-1.0.patch
+0009-Don-t-define-strdup.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/apron.git