adium 4806:ea7d0746818b: libpurple 2.10.4 [im.pidgin.adium @ b5a...

commits at adium.im commits at adium.im
Tue May 8 16:06:35 UTC 2012


details:	http://hg.adium.im/adium/rev/ea7d0746818b
revision:	4806:ea7d0746818b
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue May 08 18:03:59 2012 +0200

libpurple 2.10.4 [im.pidgin.adium @ b5a51884d41f2b5ffd21b1443cc57f126a97273b]
Subject: adium 4807:67a03e758cf8: Update build.sh to find the 10.6 SDK with Xcode 4.3. However, hardcode CC to gcc (from MacPorts).

details:	http://hg.adium.im/adium/rev/67a03e758cf8
revision:	4807:67a03e758cf8
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Tue May 08 18:05:54 2012 +0200

Update build.sh to find the 10.6 SDK with Xcode 4.3. However, hardcode CC to gcc (from MacPorts).

Building at least GLib with clang never worked right for me.

diffs (37 lines):

diff -r 7e8948b71619 -r 67a03e758cf8 Dependencies/build.sh
--- a/Dependencies/build.sh	Tue May 01 14:43:59 2012 -0400
+++ b/Dependencies/build.sh	Tue May 08 18:05:54 2012 +0200
@@ -22,8 +22,8 @@
 NUMBER_OF_CORES=`sysctl -n hw.activecpu`
 
 # Also try /Developer-old, just in case XCode 4 is installed
-DEVELOPER="/Developer"
-SDK_ROOT="${DEVELOPER}/SDKs/MacOSX10.6.sdk"
+DEVELOPER=$(xcode-select -print-path)
+SDK_ROOT="${DEVELOPER}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk"
 
 MIN_OS_VERSION="10.6"
 BASE_CFLAGS="-fstack-protector -isysroot $SDK_ROOT \
@@ -161,8 +161,8 @@
 	eval `$DEVELOPER/usr/bin/pump --startup`
 else
 	# Try to find the right gcc, even when XCode4 is installed
-	export CC="$DEVELOPER/usr/bin/gcc"
-	export CXX="$DEVELOPER/usr/bin/g++"
+	export CC="/opt/local/bin/gcc-apple-4.2"
+	export CXX="/opt/local/bin/g++-apple-4.2"
 	export CCAS="$CC"
 	export OBJC="$CC"
 fi
diff -r 7e8948b71619 -r 67a03e758cf8 Frameworks/libglib.framework/Versions/2.0.0/libglib
Binary file Frameworks/libglib.framework/Versions/2.0.0/libglib has changed
diff -r 7e8948b71619 -r 67a03e758cf8 Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule
Binary file Frameworks/libgmodule.framework/Versions/2.0.0/libgmodule has changed
diff -r 7e8948b71619 -r 67a03e758cf8 Frameworks/libgobject.framework/Versions/2.0.0/libgobject
Binary file Frameworks/libgobject.framework/Versions/2.0.0/libgobject has changed
diff -r 7e8948b71619 -r 67a03e758cf8 Frameworks/libgthread.framework/Versions/2.0.0/libgthread
Binary file Frameworks/libgthread.framework/Versions/2.0.0/libgthread has changed
diff -r 7e8948b71619 -r 67a03e758cf8 Frameworks/libintl.framework/Versions/8/libintl
Binary file Frameworks/libintl.framework/Versions/8/libintl has changed
diff -r 7e8948b71619 -r 67a03e758cf8 Frameworks/libpurple.framework/Versions/0.10.0/libpurple
Binary file Frameworks/libpurple.framework/Versions/0.10.0/libpurple has changed




More information about the commits mailing list