[gtk-osx] gmp's and nettle's tools can't compile on versions of OS X with headers only in the SDK

From: John Ralls <jralls src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-osx] gmp's and nettle's tools can't compile on versions of OS X with headers only in the SDK
Date: Sun, 22 Feb 2015 23:51:20 +0000 (UTC)
commit bd6aca02cb04ab560c92e402d1ffc39b10f02335
Author: John Ralls <jralls ceridwen us>
Date:   Sun Feb 22 15:06:00 2015 -0800

    gmp's and nettle's tools can't compile on versions of OS X with headers only in the SDK
    
    Unless we tell them where to find the standard headers.

 modulesets-stable/gtk-osx-random.modules          |    4 ++-
 modulesets-stable/gtk-osx-unsupported.modules     |    4 ++-
 modulesets-unstable/gtk-osx-random.modules        |    4 ++-
 modulesets/gtk-osx-random.modules                 |    4 ++-
 patches/gmp-cc-for-build-needs-cflags.patch       |   41 +++++++++++++++++++++
 patches/libnettle-cc-for-build-needs-cflags.patch |   39 ++++++++++++++++++++
 6 files changed, 92 insertions(+), 4 deletions(-)
---
diff --git a/modulesets-stable/gtk-osx-random.modules b/modulesets-stable/gtk-osx-random.modules
index ae39f3e..7b3d529 100644
--- a/modulesets-stable/gtk-osx-random.modules
+++ b/modulesets-stable/gtk-osx-random.modules
@@ -392,7 +392,9 @@ Libglade itself is deprecated. This is the last release. -->
 
   <autotools id="gmp">
     <!--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"/>
+    <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"/>
+    </branch>
   </autotools>
 
   <autotools id="libunistring" autogen-sh="configure">
diff --git a/modulesets-stable/gtk-osx-unsupported.modules b/modulesets-stable/gtk-osx-unsupported.modules
index 0320bed..e810520 100644
--- a/modulesets-stable/gtk-osx-unsupported.modules
+++ b/modulesets-stable/gtk-osx-unsupported.modules
@@ -82,7 +82,9 @@
        autogenargs="--disable-documentation --disable-assembler">
     <!-- gnutls 3.3.x does not support nettle 3.0 -->
     <branch repo="ftp.gnu.org" version="2.7.1"
-            module="nettle/nettle-2.7.1.tar.gz"/>
+            module="nettle/nettle-2.7.1.tar.gz">
+      <patch 
file="http://git.gnome.org/browse/gtk-osx/plain/patches/libnettle-cc-for-build-needs-cflags.patch"; strip="1"/>
+    </branch>
     <dependencies>
       <dep package="gmp"/>
     </dependencies>
diff --git a/modulesets-unstable/gtk-osx-random.modules b/modulesets-unstable/gtk-osx-random.modules
index 156d546..91eed54 100644
--- a/modulesets-unstable/gtk-osx-random.modules
+++ b/modulesets-unstable/gtk-osx-random.modules
@@ -282,7 +282,9 @@
        having to install yet another vcs tool. -->
   <autotools id="gmp">
     <!--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"/>
+    <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"/>
+    </branch>
   </autotools>
 
   <autotools id="libunistring" autogen-sh="configure">
diff --git a/modulesets/gtk-osx-random.modules b/modulesets/gtk-osx-random.modules
index 6f58f6a..fb01c8b 100644
--- a/modulesets/gtk-osx-random.modules
+++ b/modulesets/gtk-osx-random.modules
@@ -325,7 +325,9 @@
        having to install yet another vcs tool. -->
  <autotools id="gmp">
     <!--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"/>
+    <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"/>
+    </branch>
   </autotools>
 
   <autotools id="libunistring" autogen-sh="configure">
diff --git a/patches/gmp-cc-for-build-needs-cflags.patch b/patches/gmp-cc-for-build-needs-cflags.patch
new file mode 100644
index 0000000..cc03725
--- /dev/null
+++ b/patches/gmp-cc-for-build-needs-cflags.patch
@@ -0,0 +1,41 @@
+diff -c /Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/gmp-4.3.2/Makefile.in\~ 
/Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/gmp-4.3.2/Makefile.in
+--- a/Makefile.in      Thu Jan  7 12:09:42 2010
++++ b/Makefile.in      Sun Feb 22 15:27:33 2015
+@@ -1313,7 +1313,7 @@
+       ./gen-fac_ui $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpz/fac_ui.h || (rm -f mpz/fac_ui.h; exit 1)
+ 
+ gen-fac_ui$(EXEEXT_FOR_BUILD): gen-fac_ui$(U_FOR_BUILD).c dumbmp.c
+-      $(CC_FOR_BUILD) `test -f 'gen-fac_ui$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fac_ui$(U_FOR_BUILD).c 
-o gen-fac_ui$(EXEEXT_FOR_BUILD)
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f 'gen-fac_ui$(U_FOR_BUILD).c' || echo 
'$(srcdir)/'`gen-fac_ui$(U_FOR_BUILD).c -o gen-fac_ui$(EXEEXT_FOR_BUILD)
+ 
+ gen-fac_ui_.c: gen-fac_ui.c $(ANSI2KNR)
+       $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-fac_ui.c; then echo $(srcdir)/gen-fac_ui.c; else echo 
gen-fac_ui.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-fac_ui_.c || rm -f gen-fac_ui_.c
+@@ -1325,7 +1325,7 @@
+       ./gen-fib table $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/fib_table.c || (rm -f mpn/fib_table.c; exit 
1)
+ 
+ gen-fib$(EXEEXT_FOR_BUILD): gen-fib$(U_FOR_BUILD).c dumbmp.c
+-      $(CC_FOR_BUILD) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o 
gen-fib$(EXEEXT_FOR_BUILD)
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f 'gen-fib$(U_FOR_BUILD).c' || echo 
'$(srcdir)/'`gen-fib$(U_FOR_BUILD).c -o gen-fib$(EXEEXT_FOR_BUILD)
+ 
+ gen-fib_.c: gen-fib.c $(ANSI2KNR)
+       $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-fib.c; then echo $(srcdir)/gen-fib.c; else echo gen-fib.c; 
fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-fib_.c || rm -f gen-fib_.c
+@@ -1337,7 +1337,7 @@
+       ./gen-bases table $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/mp_bases.c || (rm -f mpn/mp_bases.c; exit 
1)
+ 
+ gen-bases$(EXEEXT_FOR_BUILD): gen-bases$(U_FOR_BUILD).c dumbmp.c
+-      $(CC_FOR_BUILD) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-bases$(U_FOR_BUILD).c 
-o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f 'gen-bases$(U_FOR_BUILD).c' || echo 
'$(srcdir)/'`gen-bases$(U_FOR_BUILD).c -o gen-bases$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ 
+ gen-bases_.c: gen-bases.c $(ANSI2KNR)
+       $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-bases.c; then echo $(srcdir)/gen-bases.c; else echo 
gen-bases.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-bases_.c || rm -f gen-bases_.c
+@@ -1346,7 +1346,7 @@
+       ./gen-psqr $(BITS_PER_MP_LIMB) $(GMP_NAIL_BITS) >mpn/perfsqr.h || (rm -f mpn/perfsqr.h; exit 1)
+ 
+ gen-psqr$(EXEEXT_FOR_BUILD): gen-psqr$(U_FOR_BUILD).c dumbmp.c
+-      $(CC_FOR_BUILD) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo '$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o 
gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f 'gen-psqr$(U_FOR_BUILD).c' || echo 
'$(srcdir)/'`gen-psqr$(U_FOR_BUILD).c -o gen-psqr$(EXEEXT_FOR_BUILD) $(LIBM_FOR_BUILD)
+ 
+ gen-psqr_.c: gen-psqr.c $(ANSI2KNR)
+       $(CPP_FOR_BUILD) `if test -f $(srcdir)/gen-psqr.c; then echo $(srcdir)/gen-psqr.c; else echo 
gen-psqr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > gen-psqr_.c || rm -f gen-psqr_.c
+
+Diff finished.  Sun Feb 22 15:27:41 2015
diff --git a/patches/libnettle-cc-for-build-needs-cflags.patch 
b/patches/libnettle-cc-for-build-needs-cflags.patch
new file mode 100644
index 0000000..cf4a5ae
--- /dev/null
+++ b/patches/libnettle-cc-for-build-needs-cflags.patch
@@ -0,0 +1,39 @@
+diff -c /Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/nettle-2.7.1/Makefile.in\~ 
/Users/john/Development/Gramps-Build/gramps-41-git-Leopard/src/nettle-2.7.1/Makefile.in
+--- a/Makefile.in      Tue May 28 07:21:53 2013
++++ b/Makefile.in      Sun Feb 22 15:31:18 2015
+@@ -229,27 +229,27 @@
+ # executable. Avoid object file targets to make it easy to run the
+ # right compiler.
+ aesdata$(EXEEXT_FOR_BUILD): aesdata.c
+-      $(CC_FOR_BUILD) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f aesdata.c || echo '$(srcdir)/'`aesdata.c \
+       -o aesdata$(EXEEXT_FOR_BUILD)
+ 
+ desdata$(EXEEXT_FOR_BUILD): desdata.c
+-      $(CC_FOR_BUILD) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f desdata.c || echo '$(srcdir)/'`desdata.c \
+       -o desdata$(EXEEXT_FOR_BUILD)
+ 
+ twofishdata$(EXEEXT_FOR_BUILD): twofishdata.c
+-      $(CC_FOR_BUILD) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f twofishdata.c || echo '$(srcdir)/'`twofishdata.c \
+       -o twofishdata$(EXEEXT_FOR_BUILD)
+ 
+ shadata$(EXEEXT_FOR_BUILD): shadata.c
+-      $(CC_FOR_BUILD) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f shadata.c || echo '$(srcdir)/'`shadata.c -lm \
+       -o shadata$(EXEEXT_FOR_BUILD)
+ 
+ gcmdata$(EXEEXT_FOR_BUILD): gcmdata.c
+-      $(CC_FOR_BUILD) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f gcmdata.c || echo '$(srcdir)/'`gcmdata.c \
+       -o gcmdata$(EXEEXT_FOR_BUILD)
+ 
+ eccdata$(EXEEXT_FOR_BUILD): eccdata.c mini-gmp.c mini-gmp.h
+-      $(CC_FOR_BUILD) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \
++      $(CC_FOR_BUILD) $(CFLAGS) `test -f eccdata.c || echo '$(srcdir)/'`eccdata.c \
+       -o eccdata$(EXEEXT_FOR_BUILD)
+ 
+ # desCore rules
+
+Diff finished.  Sun Feb 22 15:31:34 2015
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]