libserf/serf-1.3.8-norpath.patch
Joe Orton 62d0219b9b update to 1.3.8 (#1155115, #1155392)
- remove RPATHs (#1154690)
Resolves: rhbz#1154690
Resolves: rhbz#1155392
Resolves: rhbz#1155115
2015-06-23 09:39:19 +01:00

37 lines
1.2 KiB
Diff

https://bugzilla.redhat.com/show_bug.cgi?id=1154690
--- serf-1.3.8/SConstruct.norpath
+++ serf-1.3.8/SConstruct
@@ -218,9 +218,6 @@ if sys.platform != 'win32':
else:
LIBNAMESTATIC = 'serf-${MAJOR}'
-env.Append(RPATH=libdir,
- PDB='${TARGET.filebase}.pdb')
-
if sys.platform == 'darwin':
# linkflags.append('-Wl,-install_name,@executable_path/%s.dylib' % (LIBNAME,))
env.Append(LINKFLAGS='-Wl,-install_name,%s/%s.dylib' % (thisdir, LIBNAME,))
@@ -366,12 +363,6 @@ if gssapi and CALLOUT_OKAY:
if sys.platform == 'win32':
env.Append(CPPDEFINES=['SERF_HAVE_SSPI'])
-# On some systems, the -R values that APR describes never make it into actual
-# RPATH flags. We'll manually map all directories in LIBPATH into new
-# flags to set RPATH values.
-for d in env['LIBPATH']:
- env.Append(RPATH=':'+d)
-
# Set up the construction of serf-*.pc
pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),
env.File('build/serf.pc.in'),
@@ -439,7 +430,6 @@ env.AlwaysBuild(env.Alias('check', TEST_
ENV={'PATH' : os.environ['PATH']}))
# Find the (dynamic) library in this directory
-tenv.Replace(RPATH=thisdir)
tenv.Prepend(LIBS=[LIBNAMESTATIC, ],
LIBPATH=[thisdir, ])