net/gpsd/patches/002-no_chrpath.patch

   1 --- a/SConstruct
   2 +++ b/SConstruct
   3 @@ -270,8 +270,6 @@ def installdir(dir, add_destdir=True):
   4
   5  # Honor the specified installation prefix in link paths.
   6  env.Prepend(LIBPATH=[installdir('libdir')])
   7 -if env["shared"]:
   8 -    env.Prepend(RPATH=[installdir('libdir')])
   9
  10  # Give deheader a way to set compiler flags
  11  if 'MORECFLAGS' in os.environ:
  12 @@ -390,17 +388,6 @@ config = Configure(env, custom_tests = {
  13                                           'CheckXsltproc' : CheckXsltproc})
  14
  15  env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
  16 -if config.CheckExecutable('$CHRPATH -v', 'chrpath'):
  17 -    # Tell generated binaries to look in the current directory for
  18 -    # shared libraries so we can run tests without hassle. Should be
  19 -    # handled sanely by scons on all systems.  Not good to use '.' or
  20 -    # a relative path here; it's a security risk.  At install time we
  21 -    # use chrpath to edit this out of RPATH.
  22 -    if env["shared"]:
  23 -        env.Prepend(RPATH=[os.path.realpath(os.curdir)])
  24 -else:
  25 -    print "chrpath is not available, forcing static linking."
  26 -    env["shared"] = False
  27
  28  confdefs = ["/* gpsd_config.h.  Generated by scons, do not hand-hack.  */\n"]
  29
  30 @@ -1147,11 +1134,6 @@ binaryinstall.append(LibraryInstall(env,
  31  if qt_env:
  32      binaryinstall.append(LibraryInstall(qt_env, installdir('libdir'), compiled_qgpsmmlib))
  33
  34 -# We don't use installdir here in order to avoid having DESTDIR affect the rpath
  35 -if env["shared"]:
  36 -    env.AddPostAction(binaryinstall, '$CHRPATH -r "%s" "$TARGET"' \
  37 -                      % (installdir('libdir', False), ))
  38 -
  39  if not env['debug'] and not env['profiling'] and env['strip']:
  40      env.AddPostAction(binaryinstall, '$STRIP $TARGET')
  41