<!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>[135694] trunk/dports/net/gpsd</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/135694">135694</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-04-29 18:46:29 -0700 (Wed, 29 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gpsd: use the right compiler and -arch flags when building the python module (#47498)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetgpsdPortfile">trunk/dports/net/gpsd/Portfile</a></li>
<li><a href="#trunkdportsnetgpsdfilespatchSConstructdiff">trunk/dports/net/gpsd/files/patch-SConstruct.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetgpsdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/gpsd/Portfile (135693 => 135694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/Portfile 2015-04-30 01:35:13 UTC (rev 135693)
+++ trunk/dports/net/gpsd/Portfile 2015-04-30 01:46:29 UTC (rev 135694)
</span><span class="lines">@@ -9,6 +9,7 @@
</span><span class="cx">
</span><span class="cx"> name gpsd
</span><span class="cx"> version 3.14
</span><ins>+revision 1
</ins><span class="cx"> license BSD
</span><span class="cx"> categories net
</span><span class="cx"> maintainers ryandesign openmaintainer
</span><span class="lines">@@ -47,14 +48,14 @@
</span><span class="cx"> build.target
</span><span class="cx"> build.args prefix=${prefix} libQgpsmm=no usb=no strip=no
</span><span class="cx"> build.env-append CC="${configure.cc} [get_canonical_archflags cc]" \
</span><del>- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</del><ins>+ CFLAGS="${configure.cflags}" \
</ins><span class="cx"> CXX="${configure.cxx} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
</span><del>- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] ${cxx_stdlibflags}" \
</del><ins>+ CXXFLAGS="${configure.cxxflags}" \
+ LDFLAGS="${configure.ldflags}" \
</ins><span class="cx"> PYTHON=${prefix}/bin/python2.7
</span><span class="cx">
</span><span class="cx"> destroot.args ${build.args}
</span><del>-eval destroot.env-append ${destroot.destdir} ${build.env}
</del><ins>+destroot.env-append {*}${destroot.destdir} {*}${build.env}
</ins><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> foreach lib {gps gpsd} {
</span></span></pre></div>
<a id="trunkdportsnetgpsdfilespatchSConstructdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/gpsd/files/patch-SConstruct.diff (135693 => 135694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/gpsd/files/patch-SConstruct.diff 2015-04-30 01:35:13 UTC (rev 135693)
+++ trunk/dports/net/gpsd/files/patch-SConstruct.diff 2015-04-30 01:46:29 UTC (rev 135694)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> --- SConstruct.orig 2015-03-14 06:24:41.000000000 -0500
</span><del>-+++ SConstruct 2015-04-15 05:18:13.000000000 -0500
</del><ins>++++ SConstruct 2015-04-29 20:38:42.000000000 -0500
</ins><span class="cx"> @@ -522,7 +522,7 @@
</span><span class="cx"> # here; it's a security risk. At install time we use
</span><span class="cx"> # chrpath to edit this out of RPATH.
</span><span class="lines">@@ -17,7 +17,26 @@
</span><span class="cx"> '-undefined', 'dynamic_lookup' ]
</span><span class="cx">
</span><span class="cx"> ilib = env.SharedLibrary(libname,lib_objs,
</span><del>-@@ -1397,7 +1398,7 @@
</del><ins>+@@ -1148,17 +1149,8 @@
+ basecflags += ' -coverage'
+ ldflags += ' -coverage'
+ ldshared += ' -coverage'
+- # in case CC/CXX was set to the scan-build wrapper,
+- # ensure that we build the python modules with scan-build, too
+- if env['CC'] is None or env['CC'].find('scan-build') < 0:
+- python_env['CC'] = cc
+- else:
+- python_env['CC'] = ' '.join([env['CC']] + cc.split()[1:])
+- if env['CXX'] is None or env['CXX'].find('scan-build') < 0:
+- python_env['CXX'] = cxx
+- else:
+- python_env['CXX'] = ' '.join([env['CXX']] + cxx.split()[1:])
+
++ ldshared=ldshared.replace(cc, env['CC'])
+ ldshared=ldshared.replace('-fPIE', '')
+ ldshared=ldshared.replace('-pie', '')
+ python_env.Replace(SHLINKFLAGS=[],
+@@ -1397,7 +1389,7 @@
</ins><span class="cx"> if qt_env:
</span><span class="cx"> binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>