[121688] trunk/dports/x11/tk
and.damore at macports.org
and.damore at macports.org
Fri Jul 4 01:44:51 PDT 2014
Revision: 121688
https://trac.macports.org/changeset/121688
Author: and.damore at macports.org
Date: 2014-07-04 01:44:51 -0700 (Fri, 04 Jul 2014)
Log Message:
-----------
port tk: remove clang's garbage collection flag when Xcode version is greater than 5.1; fix #42850; maintainer timeout
Modified Paths:
--------------
trunk/dports/x11/tk/Portfile
Added Paths:
-----------
trunk/dports/x11/tk/files/patch-macosx_configure.diff
trunk/dports/x11/tk/files/patch-unix_configure.diff
Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile 2014-07-04 07:29:21 UTC (rev 121687)
+++ trunk/dports/x11/tk/Portfile 2014-07-04 08:44:51 UTC (rev 121688)
@@ -46,6 +46,13 @@
patchfiles patch-macosx-tkMacOSXDraw.c.diff \
patch-unix-Makefile.in.diff
+pre-patch {
+ if {[vercmp $xcodeversion 5.1.1] >= 0} {
+ patchfiles-append patch-macosx_configure.diff \
+ patch-unix_configure.diff
+ }
+}
+
post-patch {
reinplace s|@TCL_SRC_DIR@|${workpath}/tcl${version}/|g ${worksrcpath}/Makefile.in
}
Added: trunk/dports/x11/tk/files/patch-macosx_configure.diff
===================================================================
--- trunk/dports/x11/tk/files/patch-macosx_configure.diff (rev 0)
+++ trunk/dports/x11/tk/files/patch-macosx_configure.diff 2014-07-04 08:44:51 UTC (rev 121688)
@@ -0,0 +1,11 @@
+--- macosx/configure.orig 2014-03-14 15:06:12.000000000 +0100
++++ macosx/configure 2014-03-14 15:07:00.000000000 +0100
+@@ -9707,7 +9707,7 @@
+ _ACEOF
+
+ LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
+- EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
++ EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
+ TK_WINDOWINGSYSTEM=AQUA
+ if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
+
Added: trunk/dports/x11/tk/files/patch-unix_configure.diff
===================================================================
--- trunk/dports/x11/tk/files/patch-unix_configure.diff (rev 0)
+++ trunk/dports/x11/tk/files/patch-unix_configure.diff 2014-07-04 08:44:51 UTC (rev 121688)
@@ -0,0 +1,11 @@
+--- unix/configure.orig 2014-03-14 15:06:37.000000000 +0100
++++ unix/configure 2014-03-14 15:07:25.000000000 +0100
+@@ -9699,7 +9699,7 @@
+ _ACEOF
+
+ LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
+- EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c -fobjc-gc'
++ EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
+ TK_WINDOWINGSYSTEM=AQUA
+ if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140704/1e5dd864/attachment.html>
More information about the macports-changes
mailing list