Ticket #47438: patch-buildsystem.diff

build.sh

@@ -12 +12 @@
 # Beware: GNU libtool cannot handle directory names containing whitespace.
 #         Therefore, do not set M_CONF_TMPDIR to such a directory.
 #
-readonly M_CONF_TMPDIR=/tmp
+readonly M_CONF_TMPDIR=@@TMP@@
 readonly M_PLISTSIGNER_TEST_KEY="`dirname $0`/prefpane/autoinstaller/TestKeys/private_key.der"
 
 # Other constants
@@ -105 +105 @@
 declare M_XCODE62=""
 declare M_XCODE62_VERSION=6.2
 readonly M_XCODE62_COMPILER="com.apple.compilers.llvm.clang.1_0"
+declare M_XCODE63=""
+declare M_XCODE63_VERSION=6.3
+readonly M_XCODE63_COMPILER="com.apple.compilers.llvm.clang.1_0"
 
 declare M_ACTUAL_PLATFORM=""
 declare M_PLATFORMS=""
@@ -104 +104 @@
 declare M_XCODE_VERSION_REQUIRED=""
 
 # SDK 10.5
-readonly M_SDK_105_ARCHS="ppc ppc64 i386 x86_64"
+readonly M_SDK_105_ARCHS="@@ARCHS@@"
 declare M_SDK_105=""
 declare M_SDK_105_XCODE=""
 declare M_SDK_105_COMPILER=""
 
 # SDK 10.6
-readonly M_SDK_106_ARCHS="i386 x86_64"
+readonly M_SDK_106_ARCHS="@@ARCHS@@"
 declare M_SDK_106=""
 declare M_SDK_106_XCODE=""
 declare M_SDK_106_COMPILER=""
 
 # SDK 10.7
-readonly M_SDK_107_ARCHS="i386 x86_64"
+readonly M_SDK_107_ARCHS="@@ARCHS@@"
 declare M_SDK_107=""
 declare M_SDK_107_XCODE=""
 declare M_SDK_107_COMPILER=""
 
 # SDK 10.8
-readonly M_SDK_108_ARCHS="i386 x86_64"
+readonly M_SDK_108_ARCHS="@@ARCHS@@"
 declare M_SDK_108=""
 declare M_SDK_108_XCODE=""
 declare M_SDK_108_COMPILER=""
 
 # SDK 10.9
-readonly M_SDK_109_ARCHS="i386 x86_64"
+readonly M_SDK_109_ARCHS="@@ARCHS@@"
 declare M_SDK_109=""
 declare M_SDK_109_XCODE=""
 declare M_SDK_109_COMPILER=""
 
 # SDK 10.10
-readonly M_SDK_1010_ARCHS="i386 x86_64"
+readonly M_SDK_1010_ARCHS="@@ARCHS@@"
 declare M_SDK_1010=""
 declare M_SDK_1010_XCODE=""
 declare M_SDK_1010_COMPILER=""
@@ -1880 +1880 @@
 
     local ms_osxfuse_out="$M_CONF_TMPDIR/osxfuse-homebrew-$ms_os_version-$ms_osxfuse_version"
     local ms_osxfuse_build="$ms_osxfuse_out/build/"
-    local ms_osxfuse_root="$m_prefix"
+    local ms_osxfuse_root="@@DESTROOT@@$m_prefix"
 
     if [ -e "$ms_osxfuse_out" ]
     then
@@ -1984 +1984 @@
     xcrun make -j4 >$m_stdout 2>$m_stderr
     m_exit_on_error "make failed while compiling the OSXFUSE library."
 
-    xcrun make install >$m_stdout 2>$m_stderr
+    xcrun make install DESTDIR="@@DESTROOT@@" >$m_stdout 2>$m_stderr
     m_exit_on_error "cannot prepare library build for installation."
 
     for f in "$ms_osxfuse_root"/lib/libosxfuse_i64*.dylib; do
@@ -2569 +2572 @@
                     M_XCODE62_VERSION=$m_xcode_version
                 fi
                 ;;
+            6.3*)
+                m_version_compare $M_XCODE63_VERSION $m_xcode_version
+                if [[ $? != 2 ]]
+                then
+                    M_XCODE63="$m_xcode_root"
+                    M_XCODE63_VERSION=$m_xcode_version
+                fi
+                ;;
             *)
                 m_log "skip unsupported Xcode version in '$m_xcode_root'."
                 ;;
@@ -2786 +2797 @@
         M_SDK_1010_COMPILER="$M_XCODE62_COMPILER"
         m_platform_realistic_add "10.10"
     fi
+    if [[ -n "$M_XCODE63" ]]
+    then
+        m_xcode_latest="$M_XCODE63"
+
+        M_SDK_109="$M_XCODE63/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk"
+        M_SDK_109_XCODE="$M_XCODE63"
+        M_SDK_109_COMPILER="$M_XCODE63_COMPILER"
+        m_platform_realistic_add "10.9"
+        m_platform_add "10.10"
+
+        M_SDK_1010="$M_XCODE63/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"
+        M_SDK_1010_XCODE="$M_XCODE63"
+        M_SDK_1010_COMPILER="$M_XCODE63_COMPILER"
+        m_platform_realistic_add "10.10"
+    fi
 
     m_read_input "$@"