| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | The RPATH handling in serf is all wrong for us and we don't need it |
| 2 | anyway so hack around it by removing this for now. |
| 3 | |
| 4 | Upstream-Status: Inappropriate |
| 5 | |
| 6 | RP 2014/7/17 |
| 7 | |
| 8 | Index: serf-1.3.6/SConstruct |
| 9 | =================================================================== |
| 10 | --- serf-1.3.6.orig/SConstruct 2014-07-17 19:57:57.724389150 +0000 |
| 11 | +++ serf-1.3.6/SConstruct 2014-07-17 20:04:21.784399616 +0000 |
| 12 | @@ -218,8 +218,7 @@ |
| 13 | else: |
| 14 | LIBNAMESTATIC = 'serf-${MAJOR}' |
| 15 | |
| 16 | -env.Append(RPATH=libdir, |
| 17 | - PDB='${TARGET.filebase}.pdb') |
| 18 | +env.Append(PDB='${TARGET.filebase}.pdb') |
| 19 | |
| 20 | #for i in env: |
| 21 | # print(str(env[i])) |
| 22 | @@ -371,12 +370,6 @@ |
| 23 | if sys.platform == 'win32': |
| 24 | env.Append(CPPDEFINES=['SERF_HAVE_SSPI']) |
| 25 | |
| 26 | -# On some systems, the -R values that APR describes never make it into actual |
| 27 | -# RPATH flags. We'll manually map all directories in LIBPATH into new |
| 28 | -# flags to set RPATH values. |
| 29 | -for d in env['LIBPATH']: |
| 30 | - env.Append(RPATH=':'+d) |
| 31 | - |
| 32 | # Set up the construction of serf-*.pc |
| 33 | pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,), |
| 34 | env.File('build/serf.pc.in'), |
| 35 | @@ -446,7 +439,6 @@ |
| 36 | ENV={'PATH' : os.environ['PATH']})) |
| 37 | |
| 38 | # Find the (dynamic) library in this directory |
| 39 | -tenv.Replace(RPATH=thisdir) |
| 40 | tenv.Prepend(LIBS=[LIBNAMESTATIC, ], |
| 41 | LIBPATH=[thisdir, ]) |
| 42 | |