From ba7b65f6bc3e875bb47023efda041b845af603c4 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Dec 09 2020 20:22:53 +0000 Subject: Apply patch libserf-norpath.patch patch_name: libserf-norpath.patch present_in_specfile: true location_in_specfile: 1 --- diff --git a/SConstruct b/SConstruct index 4358a23..ffcf638 100644 --- a/SConstruct +++ b/SConstruct @@ -224,9 +224,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,)]) @@ -385,12 +382,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'), @@ -461,7 +452,6 @@ else: TEST_EXES = [ os.path.join('test', '%s' % (prog)) for prog in TEST_PROGRAMS ] # Find the (dynamic) library in this directory -tenv.Replace(RPATH=thisdir) tenv.Prepend(LIBS=[LIBNAMESTATIC, ], LIBPATH=[thisdir, ])