[91722] trunk/dports/x11
jeremyhu at macports.org
jeremyhu at macports.org
Sun Apr 8 22:31:02 PDT 2012
Revision: 91722
https://trac.macports.org/changeset/91722
Author: jeremyhu at macports.org
Date: 2012-04-08 22:31:01 -0700 (Sun, 08 Apr 2012)
Log Message:
-----------
wine*: Consolidate darwin logic to work correctly on future OS versions (and get farther on Tiger)
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 2012-04-09 05:25:53 UTC (rev 91721)
+++ trunk/dports/x11/wine/Portfile 2012-04-09 05:31:01 UTC (rev 91722)
@@ -154,29 +154,36 @@
configure.compiler gcc-4.2
} elseif {${configure.compiler} == "clang"} {
depends_build-append port:apple-gcc42
+ depends_skip_archcheck-append apple-gcc42
configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-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.
- # See http://bugs.winehq.org/show_bug.cgi?id=14920
- configure.args-append --disable-win16
-}
+platform darwin {
+ if {${os.major} == 8} {
+ # Tiger's host ld is ancient (cctools based) and won't properly link this project
+ # Use apple-gcc42 with our ld64 to get it to link
+ depends_build port:apple-gcc42 port:ld64
+ depends_skip_archcheck-append apple-gcc42 ld64
-platform darwin 10 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
-}
+ configure.compiler apple-gcc-4.2
+ }
-platform darwin 11 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ if {${os.major} <= 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.
+ # See http://bugs.winehq.org/show_bug.cgi?id=14920
+ configure.args-append --disable-win16
+ }
- # Needed or wine will SIGBUS
- configure.ldflags-append -Wl,-no_pie
+ if {${os.major} >= 10} {
+ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
+ configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ }
+
+ if {${os.major} >= 11} {
+ # Needed or wine will SIGBUS
+ configure.ldflags-append -Wl,-no_pie
+ }
}
pre-fetch {
Modified: trunk/dports/x11/wine-crossover/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover/Portfile 2012-04-09 05:25:53 UTC (rev 91721)
+++ trunk/dports/x11/wine-crossover/Portfile 2012-04-09 05:31:01 UTC (rev 91722)
@@ -157,37 +157,36 @@
configure.compiler gcc-4.2
} elseif {${configure.compiler} == "clang"} {
depends_build-append port:apple-gcc42
+ depends_skip_archcheck-append apple-gcc42
configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-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.
- # See http://bugs.winehq.org/show_bug.cgi?id=14920
- configure.args-append --disable-win16
-}
+platform darwin {
+ if {${os.major} == 8} {
+ # Tiger's host ld is ancient (cctools based) and won't properly link this project
+ # Use apple-gcc42 with our ld64 to get it to link
+ depends_build port:apple-gcc42 port:ld64
+ depends_skip_archcheck-append apple-gcc42 ld64
-platform darwin 10 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
-}
+ configure.compiler apple-gcc-4.2
+ }
-platform darwin 11 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ if {${os.major} <= 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.
+ # See http://bugs.winehq.org/show_bug.cgi?id=14920
+ configure.args-append --disable-win16
+ }
- # Needed or wine will SIGBUS
- configure.ldflags-append -Wl,-no_pie
-}
+ if {${os.major} >= 10} {
+ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
+ configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ }
-platform darwin 12 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
-
- # Needed or wine will SIGBUS
- configure.ldflags-append -Wl,-no_pie
+ if {${os.major} >= 11} {
+ # Needed or wine will SIGBUS
+ configure.ldflags-append -Wl,-no_pie
+ }
}
pre-fetch {
Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile 2012-04-09 05:25:53 UTC (rev 91721)
+++ trunk/dports/x11/wine-crossover-games/Portfile 2012-04-09 05:31:01 UTC (rev 91722)
@@ -163,24 +163,32 @@
patchfiles-append patch-SSLCopyPeerCertificates.diff \
patch-dlls-windowscodecs-icnsformat.c.diff
-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.
- # See http://bugs.winehq.org/show_bug.cgi?id=14920
- configure.args-append --disable-win16
-}
+platform darwin {
+ if {${os.major} == 8} {
+ # Tiger's host ld is ancient (cctools based) and won't properly link this project
+ # Use apple-gcc42 with our ld64 to get it to link
+ depends_build port:apple-gcc42 port:ld64
+ depends_skip_archcheck-append apple-gcc42 ld64
-platform darwin 10 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
-}
+ configure.compiler apple-gcc-4.2
+ }
-platform darwin 11 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ if {${os.major} <= 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.
+ # See http://bugs.winehq.org/show_bug.cgi?id=14920
+ configure.args-append --disable-win16
+ }
- # Needed or wine will SIGBUS
- configure.ldflags-append -Wl,-no_pie
+ if {${os.major} >= 10} {
+ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
+ configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ }
+
+ if {${os.major} >= 11} {
+ # Needed or wine will SIGBUS
+ configure.ldflags-append -Wl,-no_pie
+ }
}
pre-fetch {
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2012-04-09 05:25:53 UTC (rev 91721)
+++ trunk/dports/x11/wine-devel/Portfile 2012-04-09 05:31:01 UTC (rev 91722)
@@ -153,29 +153,36 @@
configure.compiler gcc-4.2
} elseif {${configure.compiler} == "clang"} {
depends_build-append port:apple-gcc42
+ depends_skip_archcheck-append apple-gcc42
configure.compiler apple-gcc-4.2
- # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
- configure.cxx ${prefix}/bin/g++-apple-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.
- # See http://bugs.winehq.org/show_bug.cgi?id=14920
- configure.args-append --disable-win16
-}
+platform darwin {
+ if {${os.major} == 8} {
+ # Tiger's host ld is ancient (cctools based) and won't properly link this project
+ # Use apple-gcc42 with our ld64 to get it to link
+ depends_build port:apple-gcc42 port:ld64
+ depends_skip_archcheck-append apple-gcc42 ld64
-platform darwin 10 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
-}
+ configure.compiler apple-gcc-4.2
+ }
-platform darwin 11 {
- # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
- configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ if {${os.major} <= 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.
+ # See http://bugs.winehq.org/show_bug.cgi?id=14920
+ configure.args-append --disable-win16
+ }
- # Needed or wine will SIGBUS
- configure.ldflags-append -Wl,-no_pie
+ if {${os.major} >= 10} {
+ # _getdirentries_is_not_available_when_64_bit_inodes_are_in_effect dlls/ntdll/directory.o
+ configure.cppflags-append -D_DARWIN_NO_64_BIT_INODE
+ }
+
+ if {${os.major} >= 11} {
+ # Needed or wine will SIGBUS
+ configure.ldflags-append -Wl,-no_pie
+ }
}
pre-fetch {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120408/07832d48/attachment.html>
More information about the macports-changes
mailing list