[86143] trunk/dports/editors/MacVim

[raimue at macports.org]

Revision: 86143
          http://trac.macports.org/changeset/86143
Author:   raimue at macports.org
Date:     2011-10-19 15:00:08 -0700 (Wed, 19 Oct 2011)
Log Message:
-----------
editors/MacVim:
Force use of llvm-gcc-4.2 if clang has been selected due to runtime problems,
closes #30985.

Modified Paths:
--------------
    trunk/dports/editors/MacVim/Portfile

Added Paths:
-----------
    trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
    trunk/dports/editors/MacVim/files/patch-PSMTabBarControl-GCC-VERSION.diff

Modified: trunk/dports/editors/MacVim/Portfile
===================================================================
--- trunk/dports/editors/MacVim/Portfile	2011-10-19 21:55:47 UTC (rev 86142)
+++ trunk/dports/editors/MacVim/Portfile	2011-10-19 22:00:08 UTC (rev 86143)
@@ -7,7 +7,7 @@
 set snapshot        61
 set gitcommit       snapshot-${snapshot}
 version             ${vim_version}.snapshot${snapshot}
-revision            2
+revision            3
 categories          editors
 platforms           darwin
 license             VimLicense GPL-2+
@@ -35,7 +35,9 @@
 
 patchfiles          patch-src-MacVim-icons-python.diff \
                     patch-MMFullScreenWindow-case-sensitive.diff \
-                    patch-reverse-7.3.245.diff
+                    patch-reverse-7.3.245.diff \
+                    patch-MacVim-GCC-VERSION.diff \
+                    patch-PSMTabBarControl-GCC-VERSION.diff
 
 pre-fetch {
     if {${os.platform} == "darwin" && ${os.major} < 10} {
@@ -44,6 +46,11 @@
     }
 }
 
+# does not run correctly when build with clang, see #30985
+if {${configure.compiler} == "clang"} {
+    configure.compiler llvm-gcc-4.2
+}
+
 post-extract {
     # github zipball has root folder including commitish, renaming for ease of use
     file rename [glob ${workpath}/b4winckler-*] ${worksrcpath}

Added: trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff	                        (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-MacVim-GCC-VERSION.diff	2011-10-19 22:00:08 UTC (rev 86143)
@@ -0,0 +1,20 @@
+--- src/MacVim/MacVim.xcodeproj/project.pbxproj.orig	2011-10-16 16:14:43.000000000 +0200
++++ src/MacVim/MacVim.xcodeproj/project.pbxproj	2011-10-16 16:14:56.000000000 +0200
+@@ -679,7 +679,7 @@
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+-				GCC_VERSION = 4.2;
++				GCC_VERSION = "";
+ 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ 				GCC_WARN_UNUSED_VARIABLE = YES;
+ 				ONLY_ACTIVE_ARCH = YES;
+@@ -692,7 +692,7 @@
+ 			isa = XCBuildConfiguration;
+ 			buildSettings = {
+ 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+-				GCC_VERSION = 4.2;
++				GCC_VERSION = "";
+ 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ 				GCC_WARN_UNUSED_VARIABLE = YES;
+ 				ONLY_ACTIVE_ARCH = YES;

Added: trunk/dports/editors/MacVim/files/patch-PSMTabBarControl-GCC-VERSION.diff
===================================================================
--- trunk/dports/editors/MacVim/files/patch-PSMTabBarControl-GCC-VERSION.diff	                        (rev 0)
+++ trunk/dports/editors/MacVim/files/patch-PSMTabBarControl-GCC-VERSION.diff	2011-10-19 22:00:08 UTC (rev 86143)
@@ -0,0 +1,20 @@
+--- src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj.orig	2011-10-16 16:05:45.000000000 +0200
++++ src/MacVim/PSMTabBarControl/PSMTabBarControl.xcodeproj/project.pbxproj	2011-10-16 16:06:09.000000000 +0200
+@@ -551,7 +551,7 @@
+ 				GCC_OPTIMIZATION_LEVEL = 0;
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+-				GCC_VERSION = 4.2;
++				GCC_VERSION = "";
+ 				INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
+ 				INSTALL_PATH = "@executable_path/../Frameworks";
+ 				ONLY_ACTIVE_ARCH = YES;
+@@ -573,7 +573,7 @@
+ 				GCC_MODEL_TUNING = G5;
+ 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/AppKit.framework/Headers/AppKit.h";
+-				GCC_VERSION = 4.2;
++				GCC_VERSION = "";
+ 				INFOPLIST_FILE = "PSMTabBarControlFramework-Info.plist";
+ 				INSTALL_PATH = "@executable_path/../Frameworks";
+ 				ONLY_ACTIVE_ARCH = YES;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111019/c9a8b2f1/attachment.html>