[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-5-g93ce9b8
Radostan Riedel
raybuntu at googlemail.com
Sun Jul 8 23:21:53 UTC 2012
The following commit has been merged in the master branch:
commit 93ce9b8d5d3e8f75f90e53e3f6d40b672c50f553
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Mon Jul 9 01:20:08 2012 +0200
Workaround for a bug in python2.6 copy.py.
diff --git a/debian/patches/0006-adding-shlib-versioning.patch b/debian/patches/0006-adding-shlib-versioning.patch
index d872c31..dacff5c 100644
--- a/debian/patches/0006-adding-shlib-versioning.patch
+++ b/debian/patches/0006-adding-shlib-versioning.patch
@@ -9,11 +9,9 @@ Subject: adding-shlib-versioning
cctbx_sources/scitbx/lbfgs/SConscript | 4 +++
4 files changed, 85 insertions(+), 1 deletion(-)
-diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
-index 11048d5..4cba06d 100644
--- a/cctbx_sources/boost_adaptbx/SConscript
+++ b/cctbx_sources/boost_adaptbx/SConscript
-@@ -51,6 +51,9 @@ if (not env_etc.no_boost_python):
+@@ -51,6 +51,9 @@
SHLINKFLAGS=env_etc.shlinkflags_bpl,
SHLIBPREFIX="",
LIBS=["boost_python"] + env_etc.libs_python + env_etc.libm)
@@ -23,11 +21,9 @@ index 11048d5..4cba06d 100644
env_no_includes_boost_python_ext.Append(
LIBPATH=env_etc.libpath_python)
env_no_includes_boost_python_ext.Append(
-diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index debf569..3976ba3 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
-@@ -1018,4 +1018,61 @@ def enable_cuda_if_possible():
+@@ -1018,4 +1018,68 @@
enable_openmp_if_possible()
enable_cuda_if_possible()
@@ -37,8 +33,6 @@ index debf569..3976ba3 100644
+ # Please see:
+ # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+ # for reference. Otherwise it will be set to 0:0:0
-+ import SCons.Action
-+ import copy
+ env_etc.cc_save = env['CC']
+ env_etc.shcc_save = env['SHCC']
+ env_etc.cxx_save = env['CXX']
@@ -46,7 +40,7 @@ index debf569..3976ba3 100644
+ env_etc.shcxx_save = env['SHCXX']
+ env_etc.shlink_save = env['SHLINK']
+ env_etc.shobjsuffix_save = env['SHOBJSUFFIX']
-+ env_etc.SharedLibraryBuilder_save = env['BUILDERS']['SharedLibrary']
++ env_etc.SharedLibBuilder_save = env['BUILDERS']['SharedLibrary']
+ env.Replace(
+ CC='libtool --tag=CC --mode=compile ' + env_etc.cc_save,
+ SHCC='libtool --tag=CC --mode=compile ' + env_etc.shcc_save,
@@ -59,14 +53,23 @@ index debf569..3976ba3 100644
+ SHLIBSUFFIX='.la',
+ )
+ libtool_install = 'libtool --mode=install install -D ${TARGET.abspath} %s%s/${TARGET.file}'%(abs(libtbx.env.lib_path), rpath)
-+ action_list = SCons.Action.ListAction([libtool_install]).list
-+ customBuilder = copy.deepcopy(env['BUILDERS']['SharedLibrary'])
-+ customBuilder.action.list.extend(action_list)
++ import SCons.Defaults
++ action_list = [ SCons.Defaults.SharedCheck,
++ SCons.Defaults.ShLinkAction,
++ libtool_install,
++ ]
++ customBuilder = SCons.Builder.Builder(action = action_list,
++ emitter = "$SHLIBEMITTER",
++ prefix = '$SHLIBPREFIX',
++ suffix = '$SHLIBSUFFIX',
++ target_scanner = ProgramScanner,
++ src_suffix = '$SHOBJSUFFIX',
++ src_builder = 'SharedObject')
+ env['BUILDERS']['SharedLibrary'] = customBuilder
+env_etc.set_libtool = set_libtool
+
+def unset_libtool(env, rpath):
-+ env['BUILDERS']['SharedLibrary'] = env_etc.SharedLibraryBuilder_save
++ env['BUILDERS']['SharedLibrary'] = env_etc.SharedLibBuilder_save
+ env.Replace(
+ CC=env_etc.cc_save,
+ SHCC=env_etc.shcc_save,
@@ -89,11 +92,9 @@ index debf569..3976ba3 100644
+ env_etc.set_libtool(env_base, env_etc.rpath)
+
Export("env_base", "env_etc")
-diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
-index c3e1c7d..484142b 100644
--- a/cctbx_sources/libtbx/env_config.py
+++ b/cctbx_sources/libtbx/env_config.py
-@@ -701,6 +701,8 @@ Wait for the command to finish, then try again.""" % vars())
+@@ -701,6 +701,8 @@
precompile_headers=command_line.options.precompile_headers,
static_libraries=command_line.options.static_libraries,
static_exe=command_line.options.static_exe,
@@ -102,7 +103,7 @@ index c3e1c7d..484142b 100644
scan_boost=command_line.options.scan_boost,
write_full_flex_fwd_h=command_line.options.write_full_flex_fwd_h,
boost_python_no_py_signatures
-@@ -1759,6 +1761,8 @@ class build_options:
+@@ -1759,6 +1761,8 @@
warning_level,
static_libraries,
static_exe,
@@ -111,7 +112,7 @@ index c3e1c7d..484142b 100644
scan_boost,
write_full_flex_fwd_h=default_write_full_flex_fwd_h,
build_boost_python_extensions=default_build_boost_python_extensions,
-@@ -1783,7 +1787,12 @@ class build_options:
+@@ -1783,7 +1787,12 @@
"debug", "debug_optimized", "profile"])
if (self.static_exe):
self.static_libraries = True
@@ -125,7 +126,7 @@ index c3e1c7d..484142b 100644
def get_flags_from_environment(self):
if (self.use_environment_flags ):
-@@ -1822,6 +1831,7 @@ class build_options:
+@@ -1822,6 +1831,7 @@
print >> f, "Boost threads enabled:", self.enable_boost_threads
print >> f, "Enable OpenMP if possible:", self.enable_openmp_if_possible
print >> f, "Enable CUDA:", self.enable_cuda
@@ -133,7 +134,7 @@ index c3e1c7d..484142b 100644
print >> f, "Use opt_resources if available:", self.opt_resources
print >> f, "Use environment flags:", self.use_environment_flags
if( self.use_environment_flags ):
-@@ -1940,6 +1950,16 @@ class pre_process_args:
+@@ -1940,6 +1950,16 @@
action="store_true",
default=False,
help="link all executables statically (implies --static_libraries)")
@@ -150,11 +151,9 @@ index c3e1c7d..484142b 100644
parser.option(None, "--scan_boost",
action="store_true",
default=False,
-diff --git a/cctbx_sources/scitbx/lbfgs/SConscript b/cctbx_sources/scitbx/lbfgs/SConscript
-index 3b487a5..cbe0def 100644
--- a/cctbx_sources/scitbx/lbfgs/SConscript
+++ b/cctbx_sources/scitbx/lbfgs/SConscript
-@@ -2,6 +2,10 @@ import libtbx.load_env
+@@ -2,6 +2,10 @@
Import("env_base", "env_etc")
env = env_base.Clone()
@@ -165,4 +164,3 @@ index 3b487a5..cbe0def 100644
env_etc.enable_more_warnings(env=env)
env_etc.include_registry.append(
env=env,
---
--
Packaging for cctbx
More information about the debian-science-commits
mailing list