components/library/serf/patches/03-rpath.patch

   1 --- serf-1.3.9/SConstruct.~1~   2015-09-17 15:46:24.000000000 +0000
   2 +++ serf-1.3.9/SConstruct       2018-01-31 10:47:06.019650324 +0000
   3 @@ -224,8 +224,7 @@
   4  else:
   5    LIBNAMESTATIC = 'serf-${MAJOR}'
   6
   7 -env.Append(RPATH=libdir,
   8 -           PDB='${TARGET.filebase}.pdb')
   9 +env.Append(PDB='${TARGET.filebase}.pdb')
  10
  11  if sys.platform == 'darwin':
  12  #  linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
  13 @@ -371,7 +370,7 @@
  14      apu_libs = ''
  15
  16    env.Append(CPPPATH=['$OPENSSL/include'])
  17 -  env.Append(LIBPATH=['$OPENSSL/lib'])
  18 +#  env.Append(LIBPATH=['$OPENSSL/lib'])
  19
  20
  21  # If build with gssapi, get its information and define SERF_HAVE_GSSAPI
  22 @@ -389,7 +388,12 @@
  23  # RPATH flags. We'll manually map all directories in LIBPATH into new
  24  # flags to set RPATH values.
  25  for d in env['LIBPATH']:
  26 -  env.Append(RPATH=':'+d)
  27 +  if d not in ['/lib', '/lib/64',
  28 +    '/lib/amd64', '/lib/sparcv9',
  29 +    '/usr/lib', '/usr/lib/64',
  30 +    '/usr/lib/amd64', '/usr/lib/sparcv9' ]:
  31 +    print('Appending %s to RPATH' % (d))
  32 +    env.Append(RPATH=':'+d)
  33
  34  # Set up the construction of serf-*.pc
  35  pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),