[135694] trunk/dports/net/gpsd

[ryandesign at macports.org]

Revision: 135694
          https://trac.macports.org/changeset/135694
Author:   ryandesign at macports.org
Date:     2015-04-29 18:46:29 -0700 (Wed, 29 Apr 2015)
Log Message:
-----------
gpsd: use the right compiler and -arch flags when building the python module (#47498)

Modified Paths:
--------------
    trunk/dports/net/gpsd/Portfile
    trunk/dports/net/gpsd/files/patch-SConstruct.diff

Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- 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)
@@ -9,6 +9,7 @@
 
 name                    gpsd
 version                 3.14
+revision                1
 license                 BSD
 categories              net
 maintainers             ryandesign openmaintainer
@@ -47,14 +48,14 @@
 build.target
 build.args              prefix=${prefix} libQgpsmm=no usb=no strip=no
 build.env-append        CC="${configure.cc} [get_canonical_archflags cc]" \
-                        CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
+                        CFLAGS="${configure.cflags}" \
                         CXX="${configure.cxx} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
-                        CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx] ${cxx_stdlibflags}" \
-                        LDFLAGS="${configure.ldflags} [get_canonical_archflags ld] ${cxx_stdlibflags}" \
+                        CXXFLAGS="${configure.cxxflags}" \
+                        LDFLAGS="${configure.ldflags}" \
                         PYTHON=${prefix}/bin/python2.7
 
 destroot.args           ${build.args}
-eval destroot.env-append ${destroot.destdir} ${build.env}
+destroot.env-append     {*}${destroot.destdir} {*}${build.env}
 
 post-destroot {
     foreach lib {gps gpsd} {

Modified: trunk/dports/net/gpsd/files/patch-SConstruct.diff
===================================================================
--- 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)
@@ -1,5 +1,5 @@
 --- SConstruct.orig	2015-03-14 06:24:41.000000000 -0500
-+++ SConstruct	2015-04-15 05:18:13.000000000 -0500
++++ SConstruct	2015-04-29 20:38:42.000000000 -0500
 @@ -522,7 +522,7 @@
              # here; it's a security risk.  At install time we use
              # chrpath to edit this out of RPATH.
@@ -17,7 +17,26 @@
                            '-undefined', 'dynamic_lookup' ]
  
      ilib = env.SharedLibrary(libname,lib_objs,
-@@ -1397,7 +1398,7 @@
+@@ -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 @@
  if qt_env:
      binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150429/1ccc5f8a/attachment.html>