[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-13-g0a5fb8d
Radostan Riedel
raybuntu at googlemail.com
Mon Jul 9 21:21:15 UTC 2012
The following commit has been merged in the master branch:
commit 3e5d59c4eac22b22b4ddff1b30c2d6f14d1d0daa
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Mon Jul 9 23:13:14 2012 +0200
Rename patch 0008
diff --git a/debian/patches/0006-adding-shlib-versioning.patch b/debian/patches/0006-adding-shlib-versioning.patch
index 5eb5d88..2cfe4dd 100644
--- a/debian/patches/0006-adding-shlib-versioning.patch
+++ b/debian/patches/0006-adding-shlib-versioning.patch
@@ -4,14 +4,16 @@ Subject: adding-shlib-versioning
---
cctbx_sources/boost_adaptbx/SConscript | 3 ++
- cctbx_sources/libtbx/SConscript | 57 ++++++++++++++++++++++++++++++++
- cctbx_sources/libtbx/env_config.py | 22 +++++++++++-
- cctbx_sources/scitbx/lbfgs/SConscript | 4 +++
- 4 files changed, 85 insertions(+), 1 deletion(-)
+ cctbx_sources/libtbx/SConscript | 64 ++++++++++++++++++++++++++++++++
+ cctbx_sources/libtbx/env_config.py | 21 +++++++++++
+ cctbx_sources/scitbx/lbfgs/SConscript | 4 ++
+ 4 files changed, 92 insertions(+)
+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 @@
+@@ -51,6 +51,9 @@ if (not env_etc.no_boost_python):
SHLINKFLAGS=env_etc.shlinkflags_bpl,
SHLIBPREFIX="",
LIBS=["boost_python"] + env_etc.libs_python + env_etc.libm)
@@ -21,9 +23,11 @@ Subject: adding-shlib-versioning
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..1443e6c 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
-@@ -1018,4 +1018,68 @@
+@@ -1018,4 +1018,68 @@ def enable_cuda_if_possible():
enable_openmp_if_possible()
enable_cuda_if_possible()
@@ -92,9 +96,11 @@ Subject: adding-shlib-versioning
+ 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..2285c9d 100644
--- a/cctbx_sources/libtbx/env_config.py
+++ b/cctbx_sources/libtbx/env_config.py
-@@ -701,6 +701,8 @@
+@@ -701,6 +701,8 @@ Wait for the command to finish, then try again.""" % vars())
precompile_headers=command_line.options.precompile_headers,
static_libraries=command_line.options.static_libraries,
static_exe=command_line.options.static_exe,
@@ -103,7 +109,7 @@ Subject: adding-shlib-versioning
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 @@
+@@ -1759,6 +1761,8 @@ class build_options:
warning_level,
static_libraries,
static_exe,
@@ -112,7 +118,7 @@ Subject: adding-shlib-versioning
scan_boost,
write_full_flex_fwd_h=default_write_full_flex_fwd_h,
build_boost_python_extensions=default_build_boost_python_extensions,
-@@ -1784,6 +1788,12 @@
+@@ -1784,6 +1788,12 @@ class build_options:
if (self.static_exe):
self.static_libraries = True
if (self.msvc_arch_flag == "None"): self.msvc_arch_flag = None
@@ -125,7 +131,7 @@ Subject: adding-shlib-versioning
def get_flags_from_environment(self):
if (self.use_environment_flags ):
-@@ -1822,6 +1832,7 @@
+@@ -1822,6 +1832,7 @@ class build_options:
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 +139,7 @@ Subject: adding-shlib-versioning
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 +1951,16 @@
+@@ -1940,6 +1951,16 @@ class pre_process_args:
action="store_true",
default=False,
help="link all executables statically (implies --static_libraries)")
@@ -150,9 +156,11 @@ Subject: adding-shlib-versioning
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 @@
+@@ -2,6 +2,10 @@ import libtbx.load_env
Import("env_base", "env_etc")
env = env_base.Clone()
@@ -163,3 +171,4 @@ Subject: adding-shlib-versioning
env_etc.enable_more_warnings(env=env)
env_etc.include_registry.append(
env=env,
+--
diff --git a/debian/patches/0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch b/debian/patches/0008-fix-for-gcc4.7-compilation-error.patch
similarity index 97%
rename from debian/patches/0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch
rename to debian/patches/0008-fix-for-gcc4.7-compilation-error.patch
index c182580..708cf5e 100644
--- a/debian/patches/0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch
+++ b/debian/patches/0008-fix-for-gcc4.7-compilation-error.patch
@@ -1,6 +1,6 @@
From: Radostan Riedel <raybuntu at googlemail.com>
Date: Mon, 9 Jul 2012 19:58:46 +0200
-Subject: reusing upstream trunk fix for gcc4.7 compilation error
+Subject: fix for gcc4.7 compilation error
---
.../scitbx/math/boost_python/distributions.cpp | 60 +++++++++++++-------
diff --git a/debian/patches/series b/debian/patches/series
index b8dd01f..e714241 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
0005-adding-setup_py.patch
0006-adding-shlib-versioning.patch
0007-upstream-fix-for-declaration-errors-in-gcc4.7.patch
-0008-reusing-upstream-trunk-fix-for-gcc4.7-compilation-error.patch
+0008-fix-for-gcc4.7-compilation-error.patch
--
Packaging for cctbx
More information about the debian-science-commits
mailing list