Ticket #43415: osxfuse-ryandesign.diff

Portfile

@@ -5 +5 @@
 
 name                osxfuse
 version             2.6.4
+revision            1
 categories          fuse devel
 platforms           macosx
 license             BSD APSL
@@ -21 +22 @@
 
 homepage            http://osxfuse.github.io/
 
-# We want to match the supported arch
+# We will build user-space components for the specified arch, and
+# kernel modules for the kernel arch.
 set kernel_arch [exec uname -m]
-switch ${kernel_arch} {
-    i386 -
-    x86_64 {
-        supported_archs ${kernel_arch}
-    }
-    default {
-        supported_archs i386 x86_64
-    }
+# If building for different kernel arch than our buildslaves use, force a build
+# from source. The binary package IDs don't encode the kernel arch.
+if {${kernel_arch} ne "x86_64"} {
+    archive_sites
 }
 
 distfiles
@@ -81 +79 @@
 
     # Only build the archs we want, not the hardcoded universal archs
     reinplace -E "s,@@ARCHS@@,[get_canonical_archs],g" ${worksrcpath}/build.sh
+    reinplace -E "s,@@KERNELARCHS@@,${kernel_arch},g" ${worksrcpath}/build.sh
 
     # Inject the destroot path as the buildsystem tries to write to the prefix directly
     reinplace -E "s,@@DESTROOT@@,${destroot},g" ${worksrcpath}/build.sh

files/patch-buildsystem.diff

@@ -55 +55 @@
  
      if [ -e "$ms_osxfuse_out" ]
      then
+@@ -1870,7 +1870,7 @@
+ 
+     m_log "building OSXFUSE kernel extension and tools"
+ 
+-    xcodebuild -configuration "$m_configuration" -target All GCC_VERSION="$m_compiler" ARCHS="$m_archs" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" >$m_stdout 2>$m_stderr
++    xcodebuild -configuration "$m_configuration" -target All GCC_VERSION="$m_compiler" ARCHS="@@KERNELARCHS@@" SDKROOT="$m_usdk_dir" MACOSX_DEPLOYMENT_TARGET="$m_platform" >$m_stdout 2>$m_stderr
+ 
+     m_exit_on_error "xcodebuild cannot build configuration $m_configuration."
+ 
 @@ -1945,7 +1945,7 @@
      xcrun make -j4 >$m_stdout 2>$m_stderr
      m_exit_on_error "make failed while compiling the OSXFUSE library."