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-static-lib.patch (1922B)

    

  1. respect the active archiver tool instead of using `ar` all the time.

  2. same for `ranlib`.

  3. 

  4. also add support for BUILD_STATIC bool for controlling the libserf.a.

  5. 

  6. --- a/SConstruct

  7. +++ b/SConstruct

  8. @@ -103,6 +103,9 @@

  9.    BoolVariable('APR_STATIC',

  10.                 "Enable using a static compiled APR",

  11.                 False),

  12. +  RawListVariable('AR', "Command name or path of the archiver", None),

  13. +  RawListVariable('RANLIB', "Command name or path of the archiver indexer", None),

  14. +  BoolVariable('BUILD_STATIC', 'Build libserf static library', True),

  15.    RawListVariable('CC', "Command name or path of the C compiler", None),

  16.    RawListVariable('CFLAGS', "Extra flags for the C compiler (space-separated)",

  17.                    None),

  18. @@ -193,6 +196,7 @@ if gssapi and os.path.isdir(gssapi):

  19.  

  20.  debug = env.get('DEBUG', None)

  21.  aprstatic = env.get('APR_STATIC', None)

  22. +build_static = env.get('BUILD_STATIC', True)

  23.  

  24.  Help(opts.GenerateHelpText(env))

  25.  opts.Save(SAVED_CONFIG, env)

  26. @@ -384,7 +388,9 @@ pkgconfig = env.Textfile('serf-%d.pc' % (MAJOR,),

  27.                                                         env.get('GSSAPI_LIBS', '')),

  28.                             })

  29.  

  30. -env.Default(lib_static, lib_shared, pkgconfig)

  31. +env.Default(lib_shared, pkgconfig)

  32. +if build_static:

  33. +  env.Default(lib_static)

  34.  

  35.  if CALLOUT_OKAY:

  36.    conf = Configure(env)

  37. @@ -420,8 +420,10 @@ if sys.platform == 'darwin':

  38.                                       % (target_install_shared_path,

  39.                                          install_shared_path)))

  40.  

  41. -env.Alias('install-lib', [install_static, install_shared,

  42. -                          ])

  43. +install_libs = [install_shared]

  44. +if build_static:

  45. +  install_libs.append(install_static)

  46. +env.Alias('install-lib', install_libs)

  47.  env.Alias('install-inc', env.Install(incdir, HEADER_FILES))

  48.  env.Alias('install-pc', env.Install(os.path.join(libdir, 'pkgconfig'),

  49.                                      pkgconfig))