<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[123208] trunk/dports/fuse/osxfuse</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/123208">123208</a></dd>
<dt>Author</dt> <dd>dports@macports.org</dd>
<dt>Date</dt> <dd>2014-08-06 18:18:29 -0700 (Wed, 06 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>osxfuse: build for active kernel architecture even if it's different
from build_arch (#43415)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsfuseosxfusePortfile">trunk/dports/fuse/osxfuse/Portfile</a></li>
<li><a href="#trunkdportsfuseosxfusefilespatchbuildsystemdiff">trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsfuseosxfusePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/osxfuse/Portfile (123207 => 123208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/osxfuse/Portfile        2014-08-07 01:12:31 UTC (rev 123207)
+++ trunk/dports/fuse/osxfuse/Portfile        2014-08-07 01:18:29 UTC (rev 123208)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name osxfuse
</span><span class="cx"> version 2.6.4
</span><ins>+revision 1
</ins><span class="cx"> categories fuse devel
</span><span class="cx"> platforms macosx
</span><span class="cx"> license BSD APSL
</span><span class="lines">@@ -21,16 +22,13 @@
</span><span class="cx">
</span><span class="cx"> homepage http://osxfuse.github.io/
</span><span class="cx">
</span><del>-# We want to match the supported arch
</del><ins>+# We will build user-space components for the specified arch, and
+# kernel modules for the kernel arch.
</ins><span class="cx"> set kernel_arch [exec uname -m]
</span><del>-switch ${kernel_arch} {
- i386 -
- x86_64 {
- supported_archs ${kernel_arch}
- }
- default {
- supported_archs i386 x86_64
- }
</del><ins>+# 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
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> distfiles
</span><span class="lines">@@ -81,6 +79,7 @@
</span><span class="cx">
</span><span class="cx"> # Only build the archs we want, not the hardcoded universal archs
</span><span class="cx"> reinplace -E "s,@@ARCHS@@,[get_canonical_archs],g" ${worksrcpath}/build.sh
</span><ins>+ reinplace -E "s,@@KERNELARCHS@@,${kernel_arch},g" ${worksrcpath}/build.sh
</ins><span class="cx">
</span><span class="cx"> # Inject the destroot path as the buildsystem tries to write to the prefix directly
</span><span class="cx"> reinplace -E "s,@@DESTROOT@@,${destroot},g" ${worksrcpath}/build.sh
</span></span></pre></div>
<a id="trunkdportsfuseosxfusefilespatchbuildsystemdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff (123207 => 123208)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff        2014-08-07 01:12:31 UTC (rev 123207)
+++ trunk/dports/fuse/osxfuse/files/patch-buildsystem.diff        2014-08-07 01:18:29 UTC (rev 123208)
</span><span class="lines">@@ -55,6 +55,15 @@
</span><span class="cx">
</span><span class="cx"> if [ -e "$ms_osxfuse_out" ]
</span><span class="cx"> then
</span><ins>+@@ -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."
+
</ins><span class="cx"> @@ -1945,7 +1945,7 @@
</span><span class="cx"> xcrun make -j4 >$m_stdout 2>$m_stderr
</span><span class="cx"> m_exit_on_error "make failed while compiling the OSXFUSE library."
</span></span></pre>
</div>
</div>
</body>
</html>