Merge lp:~ignacio-nin/galera/galera-2.x into lp:galera/2.x

[Ignacio Nin]

Fixes bug https://bugs.launchpad.net/galera/+bug/978004

[lp:~ignacio-nin/galera/galera-2.x]

128. By Ignacio Nin on 2012-04-16

Ability to specify the path to libboost_program_options.a

Add a bpostatic parameter to the scons script, so the full path to the
location of libboost_program_options.a can be specified. This is to
avoid having more hardcoded paths (/usr/lib, /usr/local/lib, etc.) in
garb/Sconscript.

[Alex Yurchenko (ayurchen)]

Ignacio, sorry for taking so long. This is a good patch, but I'm afraid we need to clarify the copyright issues here - namely we need a copyright (not exclusive, but nevertheless) on that code. I'll double this in the mailing list.

review: Needs Information

[Alex Yurchenko (ayurchen)]

Refrained from taking the patch literally, instead implemented somewhat different fix.

review: Abstain

Unmerged revisions

128. By Ignacio Nin on 2012-04-16

Ability to specify the path to libboost_program_options.a

Add a bpostatic parameter to the scons script, so the full path to the
location of libboost_program_options.a can be specified. This is to
avoid having more hardcoded paths (/usr/lib, /usr/local/lib, etc.) in
garb/Sconscript.

127. By Ignacio Nin on 2012-04-10

Avoid linkage against libboost_program_options

Library libboost_program_options was being added to the global
environment, causing libgalera_smm.so to be unnecessarily linked against
it.

This change clones the environment for garbd so libboost_program_options
is just linked against it.

=== modified file 'SConstruct'
--- SConstruct	2012-03-17 00:19:40 +0000
+++ SConstruct	2012-04-16 15:33:28 +0000
@@ -30,11 +30,12 @@
 Default target: all
 
 Commandline Options:
-    debug=n       debug build with optimization level n
-    arch=str      target architecture [i686|x86_64]
-    build_dir=dir build directory, default .
-    boost=[0|1]   disable or enable boost libraries
-    revno=XXXX    source code revision number
+    debug=n           debug build with optimization level n
+    arch=str          target architecture [i686|x86_64]
+    build_dir=dir     build directory, default .
+    boost=[0|1]       disable or enable boost libraries
+    bpostatic=path    path to libboost_program_options.a
+    revno=XXXX        source code revision number
 ''')
 
 
@@ -100,6 +101,9 @@
 Export('GALERA_VER', 'GALERA_REV')
 print 'Signature: version: ' + GALERA_VER + ', revision: ' + GALERA_REV
 
+BPO_STATIC = ARGUMENTS.get('bpostatic', '')
+Export('BPO_STATIC', 'BPO_STATIC')
+
 #
 # Set up and export default build environment
 #

=== modified file 'garb/SConscript'
--- garb/SConscript	2012-03-17 00:19:40 +0000
+++ garb/SConscript	2012-04-16 15:33:28 +0000
@@ -16,17 +16,29 @@
 env.Prepend(LIBS=File('#/gcomm/src/libgcomm.a'))
 env.Prepend(LIBS=File('#/gcs/src/libgcs4garb.a'))
 
+# Add libboost_program_options to garbd environment.
+garbd_env = env.Clone()
+
+Import('BPO_STATIC', 'BPO_STATIC')
+
 bpo_static = '/usr/lib/libboost_program_options.a'
 bpo_local_static = '/usr/local/lib/libboost_program_options.a'
 
 import os
 
-if os.path.isfile(bpo_static):
-    env.Append(LIBS=File(bpo_static))
+if BPO_STATIC != '':
+    if os.path.isfile(BPO_STATIC):
+        garbd_env.Append(LIBS=File(BPO_STATIC))
+    else:
+        print "Error: Specified library `%s' does not exist" % (BPO_STATIC)
+        Exit (1)
+
+elif os.path.isfile(bpo_static):
+    garbd_env.Append(LIBS=File(bpo_static))
 elif os.path.isfile(bpo_local_static):
-    env.Append(LIBS=File(bpo_local_static))
+    garbd_env.Append(LIBS=File(bpo_local_static))
 else:
-    env.Append(LIBS=['boost_program_options'])
+    garbd_env.Append(LIBS=['boost_program_options'])
 
 # special environment for garb_config.cpp
 conf_env = env.Clone()
@@ -34,7 +46,7 @@
 conf_env.Append(CPPFLAGS = ' -DGALERA_VER=\\"' + GALERA_VER + '\\"')
 conf_env.Append(CPPFLAGS = ' -DGALERA_REV=\\"' + GALERA_REV + '\\"')
 
-garb = env.Program(target = 'garbd',
+garb = garbd_env.Program(target = 'garbd',
                    source = Split('''
                                   garb_logger.cpp
                                   garb_gcs.cpp