Ticket #47498: patch-SConstruct.diff

SConstruct

@@ -522 +522 @@
             # here; it's a security risk.  At install time we use
             # chrpath to edit this out of RPATH.
             env.Prepend(RPATH=[os.path.realpath(os.curdir)])
-        else:
+        elif env.subst('$PLATFORM') != 'darwin':
             print "chrpath is not available; please build with chrpath=no."
 
     confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]
@@ -747 +747 @@
 # 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 +923 @@
         ilib_suffix = '.' + version + shlib_suffix
         shlink_flags += [ '-current_version', '%s' % version,
                           '-compatibility_version', '%s' % version,
+                          '-install_name', '%s/%s/lib%s.%s.dylib' % (env['prefix'], env['libdir'], libname, '%s' % version),
                           '-undefined', 'dynamic_lookup' ]
 
     ilib = env.SharedLibrary(libname,lib_objs,
@@ -1148 +1150 @@
         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 +1390 @@
 if qt_env:
     binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
 
-if env["shared"] and env["chrpath"]:
+if env["shared"] and env.subst('$PLATFORM') != 'darwin':
     env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
                       % (installdir('libdir', False), ))