From fbbd67adfea72d9531492e7d459cdd4e4598a64b Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 15 Nov 2007 10:25:15 +0000
Subject: [PATCH] Workaround for header problem when building libcurl-7.17.1
 for ppc with gcc4

svn path=/trunk/boinc/; revision=14211
---
 checkin_notes          |  7 +++++++
 mac_build/buildcurl.sh | 13 ++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 22a8595ff5..12fe409033 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -10980,3 +10980,10 @@ David  15 Nov 2007
             forum_search_action.php
             forum_subscribe.php
             forum_thread.php
+
+Charlie 15 Nov 2007
+    Mac: Workaround for header problem when building libcurl-7.17.1 for ppc 
+        with gcc4
+    
+    mac_build/
+        buildcurl.sh
diff --git a/mac_build/buildcurl.sh b/mac_build/buildcurl.sh
index 3128f747f4..c894b84d4b 100644
--- a/mac_build/buildcurl.sh
+++ b/mac_build/buildcurl.sh
@@ -24,7 +24,7 @@
 # use in building BOINC.
 #
 # by Charlie Fenton 7/21/06
-# Updated for curl-7.17.1 11/14/07
+# Updated for curl-7.17.1 11/15/07
 #
 ## In Terminal, CD to the curl-7.17.1 directory.
 ##     cd [path]/curl-7.17.1/
@@ -62,6 +62,8 @@ export LDFLAGS="-arch ppc"
 export CFLAGS="-arch ppc"
 export SDKROOT="/Developer/SDKs/MacOSX10.3.9.sdk"
 
+rm -fR macfix
+
 if [ $usegcc33 -ne 0 ]; then
 
 export CC=/usr/bin/gcc-3.3;export CXX=/usr/bin/g++-3.3
@@ -72,11 +74,14 @@ if [  $? -ne 0 ]; then return 1; fi
 
 else
 
+## workaround for header problem
+mkdir macfix
+echo "#include <gcc/darwin/3.3/stdarg.h>" >> ./macfix/stdarg.h
+
 export CC=/usr/bin/gcc-4.0;export CXX=/usr/bin/g++-4.0
 
 ## ./configure --enable-shared=NO --host=ppc
-./configure --enable-shared=NO --host=ppc CPPFLAGS="-arch ppc -I/Developer/SDKs/MacOSX10.3.9.sdk/Developer/Headers/FlatCarbon -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/3.3 -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/4.0/c++ -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include/gcc/darwin/4.0/c++/ppc-darwin -isystem /Developer/SDKs/MacOSX10.3.9.sdk/usr/include"
-
+./configure --enable-shared=NO --host=ppc CPPFLAGS="-arch ppc -I${PWD}/macfix -I/Developer/SDKs/MacOSX10.3.9.sdk/Developer/Headers/FlatCarbon -I/Developer/SDKs/MacOSX10.3.9.sdk/usr/include"
 fi
 
 if [  $? -ne 0 ]; then return 1; fi
@@ -94,6 +99,8 @@ make
 if [  $? -ne 0 ]; then return 1; fi
 mv -f lib/.libs/libcurl.a lib/libcurl_ppc.a
 
+rm -fR macfix
+
 make clean
 if [  $? -ne 0 ]; then return 1; fi