Ticket #48120: 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
@@ -113 +113 @@
 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=""
 
+# SDK 10.11
+readonly M_SDK_1011_ARCHS="@@ARCHS@@"
+declare M_SDK_1011=""
+declare M_SDK_1011_XCODE=""
+declare M_SDK_1011_COMPILER=""
+
 readonly M_FSBUNDLE_NAME="osxfusefs.fs"
 readonly M_INSTALL_RESOURCES_DIR="Install_resources"
 readonly M_KEXT_ID="com.github.osxfuse.filesystems.osxfusefs"
@@ -358 +364 @@
         m_compiler="$M_SDK_1010_COMPILER"
         m_archs="$M_SDK_1010_ARCHS"
     ;;
+    10.11*)
+        m_osname="El Capitan"
+        m_xcode_dir="$M_SDK_1011_XCODE"
+        m_usdk_dir="$M_SDK_1011"
+        m_compiler="$M_SDK_1011_COMPILER"
+        m_archs="$M_SDK_1011_ARCHS"
+    ;;
     *)
         m_osname="Unknown"
         m_xcode_dir=""
@@ -2030 +2043 @@
 
     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
@@ -2134 +2147 @@
     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