update to 1.3.8 (#1155115, #1155392)

- remove RPATHs (#1154690)
Resolves: rhbz#1154690
Resolves: rhbz#1155392
Resolves: rhbz#1155115
This commit is contained in:
Joe Orton 2015-06-23 09:39:19 +01:00
parent 51101d76d4
commit 62d0219b9b
2 changed files with 50 additions and 0 deletions

36
serf-1.3.8-norpath.patch Normal file
View File

@ -0,0 +1,36 @@
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, ])

14
serf-1.3.8-testfix.patch Normal file
View File

@ -0,0 +1,14 @@
Fix build.
--- serf-1.3.8/test/test_buckets.c.testfix
+++ serf-1.3.8/test/test_buckets.c
@@ -1234,7 +1234,7 @@ static apr_status_t deflate_compress(con
uncompressed data, + 12 bytes. This info comes from zlib.h.
Note: This isn't sufficient when using Z_NO_FLUSH and extremely compressed
data. Use a buffer bigger than what we need. */
-// buf_size = orig_len + (orig_len / 1000) + 12;
+ /* buf_size = orig_len + (orig_len / 1000) + 12; */
buf_size = 100000;
write_buf = apr_palloc(pool, buf_size);