Revision: 90164 http://trac.macports.org/changeset/90164 Author: cal@macports.org Date: 2012-02-24 11:02:27 -0800 (Fri, 24 Feb 2012) Log Message: ----------- libvpx: Fix build with Xcode 4.3 Modified Paths: -------------- trunk/dports/multimedia/libvpx/Portfile trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff Modified: trunk/dports/multimedia/libvpx/Portfile =================================================================== --- trunk/dports/multimedia/libvpx/Portfile 2012-02-24 17:01:00 UTC (rev 90163) +++ trunk/dports/multimedia/libvpx/Portfile 2012-02-24 19:02:27 UTC (rev 90164) @@ -30,7 +30,12 @@ patch-configure.diff post-patch { - reinplace "s|@DEVELOPER_DIR@|${developer_dir}|g" ${worksrcpath}/build/make/configure.sh + if {[vercmp $xcodeversion 4.3] < 0} { + set sdks_dir "${developer_dir}/SDKs" + } else { + set sdks_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs" + } + reinplace "s|@SDK_DIR@|${sdks_dir}|g" ${worksrcpath}/build/make/configure.sh } # As of 0.9.1: doesn't handle shared libraries or debug properly on darwin; Modified: trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff =================================================================== --- trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff 2012-02-24 17:01:00 UTC (rev 90163) +++ trunk/dports/multimedia/libvpx/files/patch-build-make-configure.sh.diff 2012-02-24 19:02:27 UTC (rev 90164) @@ -19,23 +19,23 @@ # platforms, so find the newest SDK available. - if [ -d "/Developer/SDKs/MacOSX10.4u.sdk" ]; then - osx_sdk_dir="/Developer/SDKs/MacOSX10.4u.sdk" -+ if [ -d "@DEVELOPER_DIR@/SDKs/MacOSX10.4u.sdk" ]; then -+ osx_sdk_dir="@DEVELOPER_DIR@/SDKs/MacOSX10.4u.sdk" ++ if [ -d "@SDK_DIR@/MacOSX10.4u.sdk" ]; then ++ osx_sdk_dir="@SDK_DIR@/MacOSX10.4u.sdk" fi - if [ -d "/Developer/SDKs/MacOSX10.5.sdk" ]; then - osx_sdk_dir="/Developer/SDKs/MacOSX10.5.sdk" -+ if [ -d "@DEVELOPER_DIR@/SDKs/MacOSX10.5.sdk" ]; then -+ osx_sdk_dir="@DEVELOPER_DIR@/SDKs/MacOSX10.5.sdk" ++ if [ -d "@SDK_DIR@/MacOSX10.5.sdk" ]; then ++ osx_sdk_dir="@SDK_DIR@/MacOSX10.5.sdk" fi - if [ -d "/Developer/SDKs/MacOSX10.6.sdk" ]; then - osx_sdk_dir="/Developer/SDKs/MacOSX10.6.sdk" -+ if [ -d "@DEVELOPER_DIR@/SDKs/MacOSX10.6.sdk" ]; then -+ osx_sdk_dir="@DEVELOPER_DIR@/SDKs/MacOSX10.6.sdk" ++ if [ -d "@SDK_DIR@/MacOSX10.6.sdk" ]; then ++ osx_sdk_dir="@SDK_DIR@/MacOSX10.6.sdk" fi - if [ -d "/Developer/SDKs/MacOSX10.7.sdk" ]; then - osx_sdk_dir="/Developer/SDKs/MacOSX10.7.sdk" -+ if [ -d "@DEVELOPER_DIR@/SDKs/MacOSX10.7.sdk" ]; then -+ osx_sdk_dir="@DEVELOPER_DIR@/SDKs/MacOSX10.7.sdk" ++ if [ -d "@SDK_DIR@/MacOSX10.7.sdk" ]; then ++ osx_sdk_dir="@SDK_DIR@/MacOSX10.7.sdk" fi case ${toolchain} in