[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-27-g6474041

[Radostan Riedel]

The following commit has been merged in the master branch:
commit c50f5320f67dc9eb2e14a0575c8cc2dd6aa28b73
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Thu Jul 19 11:32:11 2012 +0200

    Add 2 new packages for target building

diff --git a/debian/patches/0010-add-with_pycbf-option.patch b/debian/patches/0010-add-with_pycbf-option.patch
new file mode 100644
index 0000000..8e9a5d6
--- /dev/null
+++ b/debian/patches/0010-add-with_pycbf-option.patch
@@ -0,0 +1,74 @@
+From: Radostan Riedel <raybuntu at googlemail.com>
+Date: Thu, 19 Jul 2012 11:27:37 +0200
+Subject: add with_pycbf option
+
+---
+ cctbx_sources/cbflib_adaptbx/SConscript |    9 +++++----
+ cctbx_sources/libtbx/SConscript         |    1 +
+ cctbx_sources/libtbx/env_config.py      |    6 ++++++
+ 3 files changed, 12 insertions(+), 4 deletions(-)
+
+diff --git a/cctbx_sources/cbflib_adaptbx/SConscript b/cctbx_sources/cbflib_adaptbx/SConscript
+index 4ac6717..14deee3 100644
+--- a/cctbx_sources/cbflib_adaptbx/SConscript
++++ b/cctbx_sources/cbflib_adaptbx/SConscript
+@@ -77,10 +77,11 @@ if (not env_etc.no_boost_python):
+     env=env_cbflib_boost_python_ext,
+     paths=env_etc.cbflib_common_includes + [env_etc.python_include])
+ 
+-  env_cbflib_boost_python_ext.SharedLibrary(
+-    target='#lib/_pycbf',
+-    source=[prefix+"/pycbf/pycbf_wrap.c"],
+-    LIBS=["cbf"]+env_etc.libs_python+env_etc.libm)
++  if env_etc.with_pycbf:
++    env_cbflib_boost_python_ext.SharedLibrary(
++      target='#lib/_pycbf',
++      source=[prefix+"/pycbf/pycbf_wrap.c"],
++      LIBS=["cbf"]+env_etc.libs_python+env_etc.libm)
+ 
+   Export("env_cbflib_boost_python_ext")
+ 
+diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
+index ed1f857..8b637c9 100644
+--- a/cctbx_sources/libtbx/SConscript
++++ b/cctbx_sources/libtbx/SConscript
+@@ -1120,6 +1120,7 @@ def install_headerfiles(prefix):
+           env_base.Alias("install", dest)
+   os.chdir(cwd)
+ 
++env_etc.with_pycbf = libtbx.env.build_options.with_pycbf
+ env_etc.prefix = libtbx.env.build_options.install_prefix
+ env_etc.libpath = os.path.join(env_etc.prefix, 'lib')
+ env_etc.inclpath = os.path.join(env_etc.prefix, 'include')
+diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
+index b6bab84..687c00d 100644
+--- a/cctbx_sources/libtbx/env_config.py
++++ b/cctbx_sources/libtbx/env_config.py
+@@ -707,6 +707,7 @@ Wait for the command to finish, then try again.""" % vars())
+         libtoolize=command_line.options.libtoolize,
+         rpath=command_line.options.rpath,
+         use_system_libs=command_line.options.use_system_libs,
++        with_pycbf=command_line.options.with_pycbf,
+         install_prefix=command_line.options.install_prefix,
+         scan_boost=command_line.options.scan_boost,
+         write_full_flex_fwd_h=command_line.options.write_full_flex_fwd_h,
+@@ -1768,6 +1769,7 @@ class build_options:
+         static_exe,
+         libtoolize,
+         use_system_libs,
++        with_pycbf,
+         install_prefix,
+         rpath,
+         scan_boost,
+@@ -1968,6 +1970,10 @@ class pre_process_args:
+         action="store_true",
+         default=False,
+         help="Use system Libraries to build.")
++      parser.option(None, "--with_pycbf",
++        action="store_true",
++        default=False,
++        help="Build pycbf extension.")
+       parser.option(None, "--rpath",
+         type="string",
+         action="store",
+-- 
diff --git a/debian/patches/0011-build-libann-statically.patch b/debian/patches/0011-build-libann-statically.patch
new file mode 100644
index 0000000..6508c9b
--- /dev/null
+++ b/debian/patches/0011-build-libann-statically.patch
@@ -0,0 +1,28 @@
+From: Radostan Riedel <raybuntu at googlemail.com>
+Date: Thu, 19 Jul 2012 11:29:57 +0200
+Subject: build libann statically
+
+---
+ cctbx_sources/annlib_adaptbx/SConscript |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/cctbx_sources/annlib_adaptbx/SConscript b/cctbx_sources/annlib_adaptbx/SConscript
+index 31b4da6..f217b3f 100644
+--- a/cctbx_sources/annlib_adaptbx/SConscript
++++ b/cctbx_sources/annlib_adaptbx/SConscript
+@@ -29,9 +29,11 @@ if (libtbx.manual_date_stamp < 20090819):
+   env.Replace(CXXFLAGS=env_etc.cxxflags_base)
+   env.Replace(SHCXXFLAGS=env_etc.cxxflags_base)
+ 
+-if (env_etc.static_libraries): builder = env.StaticLibrary
+-else:                          builder = env.SharedLibrary
+-builder(target='#lib/ann',
++#if (env_etc.static_libraries): builder = env.StaticLibrary
++#else:                          builder = env.SharedLibrary
++# Create a static library since the changes are incompatiple
++# with debian's libann
++env.StaticLibrary(target='#lib/ann',
+   source = ["../annlib/src/ANN.cpp",
+             "../annlib/src/bd_fix_rad_search.cpp",
+             "../annlib/src/bd_pr_search.cpp",
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 9c6284f..9475ed2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,5 @@
 0007-fix-for-gcc4.7-compilation-error.patch
 0008-upstream-fix-to-use-system-libraries.patch
 0009-adding-install-targets-and-prefix-support.patch
+0010-add-with_pycbf-option.patch
+0011-build-libann-statically.patch

-- 
Packaging for cctbx