[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-75-g0c003c6
Radostan Riedel
raybuntu at googlemail.com
Thu Aug 9 19:52:51 UTC 2012
The following commit has been merged in the master branch:
commit 0c003c65d0fcde557de6fa9fc16719452bffb0c6
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Thu Aug 9 21:13:24 2012 +0200
Rework use-system-libs patch to work with gentoo
diff --git a/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch b/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch
index dcce118..b01931a 100644
--- a/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch
+++ b/debian/patches/0006-options-for-system-libs-installtarget-and-prefix.patch
@@ -14,7 +14,7 @@ Subject: options for system libs installtarget and prefix
cctbx_sources/iotbx/cif/boost_python/SConscript | 13 +-
cctbx_sources/iotbx/mtz/SConscript | 3 +-
cctbx_sources/iotbx/pdb/SConscript | 2 +-
- cctbx_sources/libtbx/SConscript | 80 +++++-
+ cctbx_sources/libtbx/SConscript | 86 +++++-
cctbx_sources/libtbx/env_config.py | 34 +++
cctbx_sources/mmtbx/den/SConscript | 2 +-
cctbx_sources/mmtbx/geometry_restraints/SConscript | 2 +-
@@ -25,10 +25,10 @@ Subject: options for system libs installtarget and prefix
.../smtbx/refinement/boost_python/SConscript | 4 +-
.../refinement/constraints/boost_python/SConscript | 4 +-
cctbx_sources/spotfinder/SConscript | 2 +-
- 22 files changed, 425 insertions(+), 260 deletions(-)
+ 22 files changed, 431 insertions(+), 260 deletions(-)
diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
-index 866b1c1..ed21fb4 100644
+index 866b1c1..68cac89 100644
--- a/cctbx_sources/boost_adaptbx/SConscript
+++ b/cctbx_sources/boost_adaptbx/SConscript
@@ -9,7 +9,13 @@ import sys, os
@@ -36,7 +36,7 @@ index 866b1c1..ed21fb4 100644
Import("env_base", "env_etc")
env_etc.boost_dist = libtbx.env.dist_path("boost")
-env_etc.boost_include = env_etc.boost_dist
-+if not env_etc.check_syslib('boost_python', extra_libs=env_etc.py_lib)\
++if not env_etc.check_syslib(env_etc.boost_python, extra_libs=env_etc.py_lib)\
+ or not env_etc.check_syslib('boost_thread'):
+ env_etc.boost_include = env_etc.boost_dist
+else:
@@ -77,7 +77,7 @@ index 866b1c1..ed21fb4 100644
- env.StaticLibrary(target="#lib/boost_python", source=bpl_dll_sources)
- else:
- env.SharedLibrary(target="#lib/boost_python", source=bpl_dll_sources)
-+ if not env_etc.check_syslib('boost_python', extra_libs=env_etc.py_lib):
++ if not env_etc.check_syslib(env_etc.boost_python, extra_libs=env_etc.py_lib):
+ if (env_etc.static_bpl):
+ env.StaticLibrary(target="#lib/boost_python", source=bpl_dll_sources)
+ else:
@@ -788,7 +788,7 @@ index 6af2664..9b89fe1 100644
env.SharedLibrary(
target="#lib/iotbx_pdb_ext",
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index debf569..a74442f 100644
+index debf569..429c44b 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -4,7 +4,7 @@ from libtbx import easy_run
@@ -800,7 +800,7 @@ index debf569..a74442f 100644
op = os.path
if (hasattr(Environment, "Clone")):
-@@ -1018,4 +1018,82 @@ def enable_cuda_if_possible():
+@@ -1018,4 +1018,88 @@ def enable_cuda_if_possible():
enable_openmp_if_possible()
enable_cuda_if_possible()
@@ -820,19 +820,25 @@ index debf569..a74442f 100644
+ return True
+env_etc.check_syslib = check_syslib
+
-+env_etc.py_str = '-py%s%s'%(sys.version[0], sys.version[2])
+env_etc.py_lib = 'python%s.%s'%(sys.version[0], sys.version[2])
+
+if (libtbx.env.build_options.use_system_libs):
+ env_etc.use_system_libs = True
+
-+if env_etc.check_syslib('boost_python%s'%env_etc.py_str,
-+ extra_libs=env_etc.py_lib):
-+ env_etc.boost_python = 'boost_python%s'%env_etc.py_str
-+ env_etc.scitbx_boost_python = 'scitbx_boost_python%s'%env_etc.py_str
-+else:
-+ env_etc.boost_python = 'boost_python'
-+ env_etc.scitbx_boost_python = 'scitbx_boost_python'
++deb_py_str = '-py%s%s'%(sys.version[0], sys.version[2])
++gentoo_py_str = '-%s.%s'%(sys.version[0], sys.version[2])
++# This list can be extended by other distro's
++py_str_lst = [deb_py_str, gentoo_py_str]
++
++for py_str in py_str_lst:
++ if env_etc.check_syslib('boost_python%s'%py_str,
++ extra_libs=env_etc.py_lib):
++ env_etc.boost_python = 'boost_python%s'%py_str
++ env_etc.scitbx_boost_python = 'scitbx_boost_python%s'%py_str
++ break
++ else:
++ env_etc.boost_python = 'boost_python'
++ env_etc.scitbx_boost_python = 'scitbx_boost_python'
+
+env_etc.prefix = libtbx.env.build_options.install_prefix
+env_etc.destdir = libtbx.env.build_options.install_destdir
diff --git a/debian/patches/0007-adding-shlib-versioning.patch b/debian/patches/0007-adding-shlib-versioning.patch
index 772061e..fd1888e 100644
--- a/debian/patches/0007-adding-shlib-versioning.patch
+++ b/debian/patches/0007-adding-shlib-versioning.patch
@@ -9,7 +9,7 @@ Subject: adding-shlib-versioning
3 files changed, 116 insertions(+), 9 deletions(-)
diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
-index ed21fb4..17f0e89 100644
+index 68cac89..dedbb05 100644
--- a/cctbx_sources/boost_adaptbx/SConscript
+++ b/cctbx_sources/boost_adaptbx/SConscript
@@ -58,6 +58,9 @@ if (not env_etc.no_boost_python):
@@ -23,10 +23,10 @@ index ed21fb4..17f0e89 100644
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 a74442f..de7abea 100644
+index 429c44b..58bdd30 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
-@@ -1055,16 +1055,99 @@ env_etc.install_path = os.path.abspath(env_etc.destdir + '/' + env_etc.prefix)
+@@ -1061,16 +1061,99 @@ env_etc.install_path = os.path.abspath(env_etc.destdir + '/' + env_etc.prefix)
env_etc.binpath = os.path.join(env_etc.install_path, 'bin')
env_etc.libpath = os.path.abspath(env_etc.install_path + '/' + env_etc.libdir)
env_etc.inclpath = os.path.join(env_etc.install_path, 'include')
@@ -130,7 +130,7 @@ index a74442f..de7abea 100644
rp = list(rp)
rp.append(lib_dir)
rp.append(include_path)
-@@ -1076,17 +1159,31 @@ def create_install_targets():
+@@ -1082,17 +1165,31 @@ def create_install_targets():
os.chdir(src_dir)
dest = None
for root, dirnames, filenames in os.walk('.'):
diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index 35d610b..30e3297 100644
--- a/debian/patches/0010-adding-setup_py.patch
+++ b/debian/patches/0010-adding-setup_py.patch
@@ -438,7 +438,7 @@ index 0000000..d118004
+ return out, list(outext)
diff --git a/setup.py b/setup.py
new file mode 100755
-index 0000000..78918e1
+index 0000000..c64a639
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,135 @@
diff --git a/debian/patches/0011-fix-missing-python-lib-during-linking.patch b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
index 57aeca7..6724c0c 100644
--- a/debian/patches/0011-fix-missing-python-lib-during-linking.patch
+++ b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
@@ -3,12 +3,12 @@ Date: Thu, 19 Jul 2012 23:26:30 +0200
Subject: fix missing python lib during linking
---
- cctbx_sources/libtbx/SConscript | 3 ++-
+ cctbx_sources/libtbx/SConscript | 4 ++--
cctbx_sources/scitbx/boost_python/SConscript | 2 +-
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index de7abea..a10d535 100644
+index 58bdd30..53e1512 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -54,9 +54,11 @@ def set_python_include_and_libs(env_etc):
@@ -23,14 +23,15 @@ index de7abea..a10d535 100644
env_etc.libpath_python = []
if (env_etc.compiler.startswith("darwin_")):
env_etc.python_framework = "/".join(
-@@ -1035,7 +1037,6 @@ def check_syslib(lib, extra_libs=None):
+@@ -1034,8 +1036,6 @@ def check_syslib(lib, extra_libs=None):
+ return True
env_etc.check_syslib = check_syslib
- env_etc.py_str = '-py%s%s'%(sys.version[0], sys.version[2])
-env_etc.py_lib = 'python%s.%s'%(sys.version[0], sys.version[2])
-
+-
if (libtbx.env.build_options.use_system_libs):
env_etc.use_system_libs = True
+
diff --git a/cctbx_sources/scitbx/boost_python/SConscript b/cctbx_sources/scitbx/boost_python/SConscript
index 1f396e5..b906eb3 100644
--- a/cctbx_sources/scitbx/boost_python/SConscript
diff --git a/debian/patches/0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch b/debian/patches/0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch
index 3573ca4..8243d93 100644
--- a/debian/patches/0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch
+++ b/debian/patches/0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch
@@ -8,7 +8,7 @@ Subject: fix to support LDFLAGS in use_enviroment_flags
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index a10d535..000f942 100644
+index 53e1512..7d51d4a 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -777,11 +777,15 @@ else:
@@ -37,7 +37,7 @@ index a10d535..000f942 100644
env_base_sync_with_env_etc()
if (static_exe):
-@@ -1065,8 +1072,10 @@ def set_libtool(env):
+@@ -1070,8 +1077,10 @@ def set_libtool(env):
# for reference. Otherwise it will be set to 0:0:0
env_etc.shobjsuffix_save = env['SHOBJSUFFIX']
env_etc.SharedLibBuilder_save = env['BUILDERS']['SharedLibrary']
diff --git a/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch b/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch
index 89ad477..c3e357e 100644
--- a/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch
+++ b/debian/patches/0014-Fix-to-append-CPPFLAGS-to-CXXFLAGS.patch
@@ -7,7 +7,7 @@ Subject: Fix to append CPPFLAGS to CXXFLAGS.
1 file changed, 2 insertions(+)
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index 000f942..4149672 100644
+index 7d51d4a..11a7810 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -798,6 +798,8 @@ else:
diff --git a/debian/patches/0017-autogenerate-pkgconfig-files.patch b/debian/patches/0017-autogenerate-pkgconfig-files.patch
index dceb53b..5646197 100644
--- a/debian/patches/0017-autogenerate-pkgconfig-files.patch
+++ b/debian/patches/0017-autogenerate-pkgconfig-files.patch
@@ -103,10 +103,10 @@ index 9b89fe1..8a83058 100644
env = env.Clone()
env_etc.include_registry.append(env=env, paths=[env_etc.fable_include])
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index 4149672..9857372 100644
+index 11a7810..1e91202 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
-@@ -1065,8 +1065,34 @@ env_etc.install_path = os.path.abspath(env_etc.destdir + '/' + env_etc.prefix)
+@@ -1070,8 +1070,34 @@ env_etc.install_path = os.path.abspath(env_etc.destdir + '/' + env_etc.prefix)
env_etc.binpath = os.path.join(env_etc.install_path, 'bin')
env_etc.libpath = os.path.abspath(env_etc.install_path + '/' + env_etc.libdir)
env_etc.inclpath = os.path.join(env_etc.install_path, 'include')
@@ -141,7 +141,7 @@ index 4149672..9857372 100644
def set_libtool(env):
# Versioning can be provided by appending "-version-info 3:12:1" to SHLINKFLAGS
# Please see:
-@@ -1192,6 +1218,11 @@ def create_install_targets():
+@@ -1197,6 +1223,11 @@ def create_install_targets():
src = os.path.join(src_dir, root, filename)
env_base.Install(dest, src)
env_base.Alias("install-header", dest)
@@ -153,7 +153,7 @@ index 4149672..9857372 100644
if src_dir == lib_dir:
break
-@@ -1199,7 +1230,11 @@ def create_install_targets():
+@@ -1204,7 +1235,11 @@ def create_install_targets():
dest = env_etc.binpath
env_base.Install(dest, Glob('%s/*'%(exe_dev)))
env_base.Alias("install-bin", dest)
--
Packaging for cctbx
More information about the debian-science-commits
mailing list