[gtk-osx] Patch gmp bug that prevents building dependent C++ programs.



commit c8162345983a81926f36a3f47d8ded34836655b6
Author: John Ralls <jralls ceridwen us>
Date:   Sat Jul 18 15:30:23 2015 -0700

    Patch gmp bug that prevents building dependent C++ programs.

 modulesets-stable/gtk-osx-random.modules   |    1 +
 modulesets-unstable/gtk-osx-random.modules |    2 ++
 modulesets/gtk-osx-random.modules          |    1 +
 patches/gmp-4.3.2-stddef.patch             |   17 +++++++++++++++++
 4 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index 118ed76..65072b2 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -410,6 +410,7 @@ Libglade itself is deprecated. This is the last release. -->
     <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.5.tar.bz2" version="5.0.5"/-->
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gmp-cc-for-build-needs-cflags.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gmp-4.3.2-stddef.patch"; strip="1"/>
     </branch>
   </autotools>
 
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 08975b4..3d72ebc 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -313,6 +313,8 @@
     <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.0.tar.bz2" version="5.0.0"/-->
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gmp-cc-for-build-needs-cflags.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gmp-4.3.2-stddef.patch"; strip="1"/>
+
     </branch>
   </autotools>
 
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 9b4f3ab..afb533e 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -347,6 +347,7 @@
     <!--branch repo="ftp.gnu.org" module="gmp/gmp-5.0.5.tar.bz2" version="5.0.2"/-->
     <branch repo="ftp.gnu.org" module="gmp/gmp-4.3.2.tar.bz2" version="4.3.2">
       <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gmp-cc-for-build-needs-cflags.patch"; 
strip="1"/>
+      <patch file="http://git.gnome.org/browse/gtk-osx/plain/patches/gmp-4.3.2-stddef.patch"; strip="1"/>
     </branch>
   </autotools>
 
diff --git a/patches/gmp-4.3.2-stddef.patch b/patches/gmp-4.3.2-stddef.patch
new file mode 100644
index 0000000..5f19c7a
--- /dev/null
+++ b/patches/gmp-4.3.2-stddef.patch
@@ -0,0 +1,17 @@
+diff -c /Users/john/Development/gtk-sources/gmp-4.3.2/gmp-h.in\~ 
/Users/john/Development/gtk-sources/gmp-4.3.2/gmp-h.in
+--- a/gmp-h.in Thu Jan  7 12:09:02 2010
++++ b/gmp-h.in Sat Jul 18 15:15:10 2015
+@@ -47,11 +47,7 @@
+ #define __GNU_MP__ 4
+ 
+ #define __need_size_t  /* tell gcc stddef.h we only want size_t */
+-#if defined (__cplusplus)
+-#include <cstddef>     /* for size_t */
+-#else
+ #include <stddef.h>    /* for size_t */
+-#endif
+ #undef __need_size_t
+ 
+ /* Instantiated by configure. */
+
+Diff finished.  Sat Jul 18 15:15:25 2015


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]