logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://hacktivis.me/git/overlay.git

serf-1.3.8-openssl.patch (960B)

    

  1. the build doesn't actually use the openssl var for anything useful.

  2. it blindly adds it to the -I/-L paths which causes problems when you

  3. cross-compile and when you link (it also adds it to -rpath).  punt

  4. the setting and forget about it.

  5. 

  6. --- a/SConstruct

  7. +++ b/SConstruct

  8. @@ -354,8 +354,6 @@ else:

  9.      apr_libs = ''

  10.      apu_libs = ''

  11.  

  12. -  env.Append(CPPPATH=['$OPENSSL/include'])

  13. -  env.Append(LIBPATH=['$OPENSSL/lib'])

  14.  

  15.  

  16.  # If build with gssapi, get its information and define SERF_HAVE_GSSAPI

  17. @@ -369,8 +369,9 @@ if sys.platform == 'win32':

  18.  # On some systems, the -R values that APR describes never make it into actual

  19.  # RPATH flags. We'll manually map all directories in LIBPATH into new

  20.  # flags to set RPATH values.

  21. -for d in env['LIBPATH']:

  22. -  env.Append(RPATH=':'+d)

  23. +if env.get('LIBPATH', None):

  24. +  for d in env['LIBPATH']:

  25. +    env.Append(RPATH=':'+d)

  26.  

  27.  # Set up the construction of serf-*.pc

  28.  pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),