[135706] trunk/dports/net/gpsd

[ryandesign at macports.org]

Revision: 135706
          https://trac.macports.org/changeset/135706
Author:   ryandesign at macports.org
Date:     2015-04-30 01:19:47 -0700 (Thu, 30 Apr 2015)
Log Message:
-----------
gpsd: fix build with pre-C11 compilers without resorting to blacklisting them (#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 05:23:06 UTC (rev 135705)
+++ trunk/dports/net/gpsd/Portfile	2015-04-30 08:19:47 UTC (rev 135706)
@@ -2,7 +2,6 @@
 # $Id$
 
 PortSystem              1.0
-PortGroup               compiler_blacklist_versions 1.0
 
 if {[variant_isset qt]} {
 PortGroup               qt4 1.0
@@ -36,9 +35,6 @@
                         patch-libgpsd.pc.in.diff \
                         leopard-IPV6_TCLASS.patch
 
-# gpsd needs C11 support
-compiler.blacklist      *gcc-4.0 *gcc-4.2 {clang < 137}
-
 use_configure           no
 
 variant universal {}

Modified: trunk/dports/net/gpsd/files/patch-SConstruct.diff
===================================================================
--- trunk/dports/net/gpsd/files/patch-SConstruct.diff	2015-04-30 05:23:06 UTC (rev 135705)
+++ trunk/dports/net/gpsd/files/patch-SConstruct.diff	2015-04-30 08:19:47 UTC (rev 135706)
@@ -1,5 +1,5 @@
---- SConstruct.orig	2015-03-14 06:24:41.000000000 -0500
-+++ SConstruct	2015-04-29 20:38:42.000000000 -0500
+--- SConstruct.orig	2015-03-14 22:24:41.000000000 +1100
++++ SConstruct	2015-04-30 17:40:03.000000000 +1000
 @@ -522,7 +522,7 @@
              # here; it's a security risk.  At install time we use
              # chrpath to edit this out of RPATH.
@@ -9,7 +9,18 @@
              print "chrpath is not available; please build with chrpath=no."
  
      confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]
-@@ -922,6 +922,7 @@
+@@ -747,8 +747,9 @@
+ # ifdef __cplusplus
+ extern "C" {
+ # endif
+-#ifndef clockid_t
++#ifndef CLOCKID_T_DEFINED
+ typedef int clockid_t;
++#define CLOCKID_T_DEFINED
+ # endif
+ /* OS X uses _STRUCT_TIMESPEC, but no clock_gettime */
+ #ifndef _STRUCT_TIMESPEC
+@@ -922,6 +923,7 @@
          ilib_suffix = '.' + version + shlib_suffix
          shlink_flags += [ '-current_version', '%s' % version,
                            '-compatibility_version', '%s' % version,
@@ -17,7 +28,7 @@
                            '-undefined', 'dynamic_lookup' ]
  
      ilib = env.SharedLibrary(libname,lib_objs,
-@@ -1148,17 +1149,8 @@
+@@ -1148,17 +1150,8 @@
          basecflags += ' -coverage'
          ldflags += ' -coverage'
          ldshared += ' -coverage'
@@ -36,7 +47,7 @@
      ldshared=ldshared.replace('-fPIE', '')
      ldshared=ldshared.replace('-pie', '')
      python_env.Replace(SHLINKFLAGS=[],
-@@ -1397,7 +1389,7 @@
+@@ -1397,7 +1390,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/20150430/bc48f940/attachment-0001.html>