[vlc-commits] contrib: growl: use gcc-4.2 when clang is not available
Rafaël Carré
git at videolan.org
Fri Dec 2 00:24:10 CET 2011
vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Thu Dec 1 14:00:55 2011 -0500| [4f4db7c328ddadd8fd5dbacf6ce3c054ccf16320] | committer: Jean-Baptiste Kempf
contrib: growl: use gcc-4.2 when clang is not available
the gcc-4.2 version on veda is old enough to build growl
newer jones version makes xcode crap out that gcc isn't compatible
(cherry picked from commit d3f91a57d47617a1b608b33297fbdb8784330d90)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=4f4db7c328ddadd8fd5dbacf6ce3c054ccf16320
---
contrib/src/growl/rules.mak | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/contrib/src/growl/rules.mak b/contrib/src/growl/rules.mak
index 77ca924..bf9eb5c 100644
--- a/contrib/src/growl/rules.mak
+++ b/contrib/src/growl/rules.mak
@@ -12,12 +12,18 @@ $(TARBALLS)/growl-$(GROWL_VERSION).tar.bz2:
.sum-growl: growl-$(GROWL_VERSION).tar.bz2
+ifeq ($(shell clang -v 2>/dev/null || echo FAIL),)
+COMPILER=com.apple.compilers.llvm.clang.1_0
+else
+COMPILER=com.apple.compilers.gcc.4_2
+endif
+
growl: growl-$(GROWL_VERSION).tar.bz2 .sum-growl
$(UNPACK)
mv Growl-1.2.2-src $@
sed -i.orig -e s/"SDKROOT = macosx10.5"/"SDKROOT = macosx$(OSX_VERSION)"/g \
- -e s/"GCC_VERSION = 4.0"/"GCC_VERSION = com.apple.compilers.llvm.clang.1_0"/g \
- -e s/com.apple.compilers.gcc.4_0/com.apple.compilers.llvm.clang.1_0/g \
+ -e s/"GCC_VERSION = 4.0"/"GCC_VERSION = $(COMPILER)"/g \
+ -e s/com.apple.compilers.gcc.4_0/$(COMPILER)/g \
$@/Growl.xcodeproj/project.pbxproj
sed -i.orig -e s/"REVISION \$$REV"/"REVISION 0x\$$REV"/g $@/generateHgRevision.sh
touch $@
More information about the vlc-commits
mailing list