[115133] trunk/dports/games/openttd

[Ryan Schmidt]

On Dec 25, 2013, at 14:11, cal at macports.org wrote:

> Revision
> 115133
> Author
> cal at macports.org
> Date
> 2013-12-25 12:11:01 -0800 (Wed, 25 Dec 2013)
> Log Message
> 
> openttd: switch to libc++ on Mavericks and above, avoid fallback to debug code when setting resolution and creating the window
> Modified Paths
> 
> 	• trunk/dports/games/openttd/Portfile
> 	• trunk/dports/games/openttd/files/patch-src__video__cocoa__cocoa_v.mm-10_9.diff


> @@ -48,17 +48,14 @@
> 
>                          port:openttd-openmsx
> 
>  
> 
>      patchfiles          patch-src__video__cocoa__cocoa_v.mm-10_9.diff
> 
> -
> -    # needs to be built against libstdc++, not libc++
> -    if {[info exists configure.cxx_stdlib]} {
> -        configure.cxx_stdlib    libstdc++
> 
> +    platform darwin {
> +        if {${os.major} >= 13} {
> +            # Mavericks builds using libc++, using a deployment target < 10.7
> +            # will break that
> +            patchfiles-append   patch-config.lib-increase-deployment-target.diff
> +        }
> 
>      }

Won’t this still fail on e.g. 10.8 if the user has changed the C++ library to libc++ in macports.conf?


> +--- config.lib.orig	2013-12-25 20:49:22.000000000 +0100
> ++++ config.lib	2013-12-25 20:49:28.000000000 +0100
> +@@ -1562,7 +1562,7 @@
> + 			# Only set the min version when not doing an universal build.
> + 			# Universal builds set the version elsewhere.
> + 			if [ "$cpu_type" = "64" ]; then
> +-				CFLAGS="$CFLAGS -mmacosx-version-min=10.5"
> ++				CFLAGS="$CFLAGS -mmacosx-version-min=10.7"
> + 			else
> + 				gcc_cpu=`$cc_host -dumpmachine`
> + 				if [ "`echo $gcc_cpu | cut -c 1-3`" = "ppc" -o "`echo $gcc_cpu | cut -c 1-7`" = "powerpc" ]; then

I’d be inclined to patch this all the time, and never set -mmacosx-version-min. (Why is it needed?)