[80096] trunk/dports/x11
jeremyhu at macports.org
jeremyhu at macports.org
Mon Jul 4 02:18:21 PDT 2011
Revision: 80096
http://trac.macports.org/changeset/80096
Author: jeremyhu at macports.org
Date: 2011-07-04 02:18:20 -0700 (Mon, 04 Jul 2011)
Log Message:
-----------
wine*: Fallback on gcc-4.2 based on chosen compiler rather than platform
Modified Paths:
--------------
trunk/dports/x11/wine/Portfile
trunk/dports/x11/wine-crossover/Portfile
trunk/dports/x11/wine-crossover-games/Portfile
trunk/dports/x11/wine-devel/Portfile
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2011-07-04 09:15:52 UTC (rev 80095)
+++ trunk/dports/x11/wine/Portfile 2011-07-04 09:18:20 UTC (rev 80096)
@@ -145,6 +145,13 @@
# This is not 64-bit friendly yet
supported_archs i386
+# llvm-gcc does not respect force_align_arg_pointer
+# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
+if {${configure.compiler} == "llvm-gcc-4.2" ||
+ ${configure.compiler} == "clang"} {
+ configure.compiler gcc-4.2
+}
+
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
# Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
@@ -166,16 +173,6 @@
# _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
- # llvm-gcc does not respect force_align_arg_pointer
- # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
- configure.compiler gcc-4.2
-
- # I have a suspicion that this may be necessary, but leaving out for now:
- #post-patch {
- # # Lion disallows heap execution.
- # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in
- #}
-
# Needed or wine will SIGBUS
configure.ldflags-append -Wl,-no_pie
}
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2011-07-04 09:15:52 UTC (rev 80095)
+++ trunk/dports/x11/wine-crossover/Portfile 2011-07-04 09:18:20 UTC (rev 80096)
@@ -147,6 +147,13 @@
# This is not 64-bit friendly yet
supported_archs i386
+# llvm-gcc does not respect force_align_arg_pointer
+# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
+if {${configure.compiler} == "llvm-gcc-4.2" ||
+ ${configure.compiler} == "clang"} {
+ configure.compiler gcc-4.2
+}
+
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
# Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
@@ -163,16 +170,6 @@
# _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
- # llvm-gcc does not respect force_align_arg_pointer
- # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
- configure.compiler gcc-4.2
-
- # I have a suspicion that this may be necessary, but leaving out for now:
- #post-patch {
- # # Lion disallows heap execution.
- # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in
- #}
-
# Needed or wine will SIGBUS
configure.ldflags-append -Wl,-no_pie
}
Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile 2011-07-04 09:15:52 UTC (rev 80095)
+++ trunk/dports/x11/wine-crossover-games/Portfile 2011-07-04 09:18:20 UTC (rev 80096)
@@ -150,6 +150,13 @@
# This is not 64-bit friendly yet
supported_archs i386
+# llvm-gcc does not respect force_align_arg_pointer
+# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
+if {${configure.compiler} == "llvm-gcc-4.2" ||
+ ${configure.compiler} == "clang"} {
+ configure.compiler gcc-4.2
+}
+
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
# Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
@@ -166,16 +173,6 @@
# _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
- # llvm-gcc does not respect force_align_arg_pointer
- # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
- configure.compiler gcc-4.2
-
- # I have a suspicion that this may be necessary, but leaving out for now:
- #post-patch {
- # # Lion disallows heap execution.
- # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in
- #}
-
# Needed or wine will SIGBUS
configure.ldflags-append -Wl,-no_pie
}
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2011-07-04 09:15:52 UTC (rev 80095)
+++ trunk/dports/x11/wine-devel/Portfile 2011-07-04 09:18:20 UTC (rev 80096)
@@ -143,6 +143,13 @@
# This is not 64-bit friendly yet
supported_archs i386
+# llvm-gcc does not respect force_align_arg_pointer
+# clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
+if {${configure.compiler} == "llvm-gcc-4.2" ||
+ ${configure.compiler} == "clang"} {
+ configure.compiler gcc-4.2
+}
+
platform darwin 9 {
# Fix "Xcode 3.x cannot build 16-bit code correctly. Use --disable-win16 if you don't need 16-bit support."
# Only affects Xcode 3.0.x and 3.1.x, not 3.2.x.
@@ -159,16 +166,6 @@
# _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
- # llvm-gcc does not respect force_align_arg_pointer
- # clang fails due to CFI-foo (winebuild uses /usr/bin/as to assemble clang-generated assembly)
- configure.compiler gcc-4.2
-
- # I have a suspicion that this may be necessary, but leaving out for now:
- #post-patch {
- # # Lion disallows heap execution.
- # reinplace "s:LDEXECFLAGS = :LDEXECFLAGS = -Wl,-allow_heap_execute :" ${worksrcpath}/loader/Makefile.in
- #}
-
# Needed or wine will SIGBUS
configure.ldflags-append -Wl,-no_pie
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110704/de48b9bf/attachment.html>
More information about the macports-changes
mailing list