[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-65-ga56fa3f
Radostan Riedel
raybuntu at googlemail.com
Sat Aug 4 19:27:26 UTC 2012
The following commit has been merged in the master branch:
commit 4656cfde4d1cb6c22634d719f2bc0d28f1ec7319
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Sat Aug 4 18:32:52 2012 +0200
Add multiarch support
diff --git a/debian/control b/debian/control
index a75df46..0beca68 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +71,8 @@ Description: Python Toolbox for crystallography
Package: libcctbx0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library for general crystallographic applications.
@@ -83,6 +85,8 @@ Description: Library for general crystallographic applications.
Package: libcctbx-sgtbx-asu0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Direct space asymmetric unit class library.
@@ -94,6 +98,8 @@ Description: Direct space asymmetric unit class library.
Package: libiotbx-mtz0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Wrapper Library to work with CCP4 MTZ files.
@@ -105,6 +111,8 @@ Description: Wrapper Library to work with CCP4 MTZ files.
Package: libiotbx-pdb0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Fast comprehensive PDB handling library.
@@ -116,6 +124,8 @@ Description: Fast comprehensive PDB handling library.
Package: libmmtbx-masks0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Masks for bulk solvent modelling.
@@ -127,6 +137,8 @@ Description: Masks for bulk solvent modelling.
Package: libomptbx0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: OpenMP interface for CCTBX.
@@ -137,6 +149,8 @@ Description: OpenMP interface for CCTBX.
Package: librstbx0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library for calculations in reciprocal space.
@@ -148,6 +162,8 @@ Description: Library for calculations in reciprocal space.
Package: libscitbx-boost-python0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: < TODO >
@@ -158,6 +174,8 @@ Description: < TODO >
Package: libscitbx-minpack0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: C++ port of files in MINPACK.
@@ -171,6 +189,8 @@ Description: C++ port of files in MINPACK.
Package: libscitbx-slatec0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: C port of files in SLATEC.
@@ -183,6 +203,8 @@ Description: C port of files in SLATEC.
Package: libsmtbx-refinement-constraints0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library for small molecule crystallography constraints.
@@ -193,6 +215,8 @@ Description: Library for small molecule crystallography constraints.
Package: libspotfinder0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: Library for locating Bragg-Spots on x-ray diffraction images.
@@ -204,6 +228,8 @@ Description: Library for locating Bragg-Spots on x-ray diffraction images.
Package: libcctbx0-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
libcctbx0 (= ${binary:Version}),
libcctbx-sgtbx-asu0 (= ${binary:Version}),
diff --git a/debian/libcctbx-sgtbx-asu0.install b/debian/libcctbx-sgtbx-asu0.install
index 0fae77e..e8c13b7 100644
--- a/debian/libcctbx-sgtbx-asu0.install
+++ b/debian/libcctbx-sgtbx-asu0.install
@@ -1,2 +1 @@
-usr/lib/libcctbx_sgtbx_asu.so.0
-usr/lib/libcctbx_sgtbx_asu.so.0.0.0
+usr/lib/*/libcctbx_sgtbx_asu.so.*
diff --git a/debian/libcctbx0-dev.install b/debian/libcctbx0-dev.install
index 31f8747..190724f 100644
--- a/debian/libcctbx0-dev.install
+++ b/debian/libcctbx0-dev.install
@@ -1,27 +1,27 @@
-usr/lib/libcctbx.so
-usr/lib/libcctbx.a
-usr/lib/libcctbx_sgtbx_asu.so
-usr/lib/libcctbx_sgtbx_asu.a
-usr/lib/libiotbx_mtz.so
-usr/lib/libiotbx_mtz.a
-usr/lib/libiotbx_pdb.so
-usr/lib/libiotbx_pdb.a
-usr/lib/libmmtbx_masks.so
-usr/lib/libmmtbx_masks.a
-usr/lib/libomptbx.so
-usr/lib/libomptbx.a
-usr/lib/librstbx.so
-usr/lib/librstbx.a
-usr/lib/libscitbx_boost_python-py*.a
-usr/lib/libscitbx_boost_python-py*.so
-usr/lib/libscitbx_minpack.a
-usr/lib/libscitbx_minpack.so
-usr/lib/libscitbx_slatec.a
-usr/lib/libscitbx_slatec.so
-usr/lib/libsmtbx_refinement_constraints.a
-usr/lib/libsmtbx_refinement_constraints.so
-usr/lib/libspotfinder.so
-usr/lib/libspotfinder.a
+usr/lib/*/libcctbx.so
+usr/lib/*/libcctbx.a
+usr/lib/*/libcctbx_sgtbx_asu.so
+usr/lib/*/libcctbx_sgtbx_asu.a
+usr/lib/*/libiotbx_mtz.so
+usr/lib/*/libiotbx_mtz.a
+usr/lib/*/libiotbx_pdb.so
+usr/lib/*/libiotbx_pdb.a
+usr/lib/*/libmmtbx_masks.so
+usr/lib/*/libmmtbx_masks.a
+usr/lib/*/libomptbx.so
+usr/lib/*/libomptbx.a
+usr/lib/*/librstbx.so
+usr/lib/*/librstbx.a
+usr/lib/*/libscitbx_boost_python-py*.a
+usr/lib/*/libscitbx_boost_python-py*.so
+usr/lib/*/libscitbx_minpack.a
+usr/lib/*/libscitbx_minpack.so
+usr/lib/*/libscitbx_slatec.a
+usr/lib/*/libscitbx_slatec.so
+usr/lib/*/libsmtbx_refinement_constraints.a
+usr/lib/*/libsmtbx_refinement_constraints.so
+usr/lib/*/libspotfinder.so
+usr/lib/*/libspotfinder.a
usr/include/boost_adaptbx
usr/include/cbflib_adaptbx
diff --git a/debian/libcctbx0.install b/debian/libcctbx0.install
index 2b04042..c4ee587 100644
--- a/debian/libcctbx0.install
+++ b/debian/libcctbx0.install
@@ -1,2 +1 @@
-usr/lib/libcctbx.so.0
-usr/lib/libcctbx.so.0.0.0
+usr/lib/*/libcctbx.so.*
diff --git a/debian/libiotbx-mtz0.install b/debian/libiotbx-mtz0.install
index fb152ce..0d66048 100644
--- a/debian/libiotbx-mtz0.install
+++ b/debian/libiotbx-mtz0.install
@@ -1,2 +1 @@
-usr/lib/libiotbx_mtz.so.0
-usr/lib/libiotbx_mtz.so.0.0.0
+usr/lib/*/libiotbx_mtz.so.*
diff --git a/debian/libiotbx-pdb0.install b/debian/libiotbx-pdb0.install
index 7d05a15..9058180 100644
--- a/debian/libiotbx-pdb0.install
+++ b/debian/libiotbx-pdb0.install
@@ -1,2 +1 @@
-usr/lib/libiotbx_pdb.so.0
-usr/lib/libiotbx_pdb.so.0.0.0
+usr/lib/*/libiotbx_pdb.so.*
diff --git a/debian/libmmtbx-masks0.install b/debian/libmmtbx-masks0.install
index 0b0156b..10b51c2 100644
--- a/debian/libmmtbx-masks0.install
+++ b/debian/libmmtbx-masks0.install
@@ -1,2 +1 @@
-usr/lib/libmmtbx_masks.so.0
-usr/lib/libmmtbx_masks.so.0.0.0
+usr/lib/*/libmmtbx_masks.so.*
diff --git a/debian/libomptbx0.install b/debian/libomptbx0.install
index 2a140d4..58b6797 100644
--- a/debian/libomptbx0.install
+++ b/debian/libomptbx0.install
@@ -1,2 +1 @@
-usr/lib/libomptbx.so.0
-usr/lib/libomptbx.so.0.0.0
+usr/lib/*/libomptbx.so.*
diff --git a/debian/librstbx0.install b/debian/librstbx0.install
index 96854a9..af34933 100644
--- a/debian/librstbx0.install
+++ b/debian/librstbx0.install
@@ -1,2 +1 @@
-usr/lib/librstbx.so.0
-usr/lib/librstbx.so.0.0.0
+usr/lib/*/librstbx.so.*
diff --git a/debian/libscitbx-boost-python0.install b/debian/libscitbx-boost-python0.install
index 506a421..567ecc5 100644
--- a/debian/libscitbx-boost-python0.install
+++ b/debian/libscitbx-boost-python0.install
@@ -1,2 +1 @@
-usr/lib/libscitbx_boost_python-py*.so.0
-usr/lib/libscitbx_boost_python-py*.so.0.0.0
+usr/lib/*/libscitbx_boost_python-py*.so.*
diff --git a/debian/libscitbx-minpack0.install b/debian/libscitbx-minpack0.install
index 1d421c3..c1dac13 100644
--- a/debian/libscitbx-minpack0.install
+++ b/debian/libscitbx-minpack0.install
@@ -1,2 +1 @@
-usr/lib/libscitbx_minpack.so.0
-usr/lib/libscitbx_minpack.so.0.0.0
+usr/lib/*/libscitbx_minpack.so.*
diff --git a/debian/libscitbx-slatec0.install b/debian/libscitbx-slatec0.install
index cdd7101..13f2ad8 100644
--- a/debian/libscitbx-slatec0.install
+++ b/debian/libscitbx-slatec0.install
@@ -1,2 +1 @@
-usr/lib/libscitbx_slatec.so.0
-usr/lib/libscitbx_slatec.so.0.0.0
+usr/lib/*/libscitbx_slatec.so.*
diff --git a/debian/libsmtbx-refinement-constraints0.install b/debian/libsmtbx-refinement-constraints0.install
index 9ba1a83..7d85a56 100644
--- a/debian/libsmtbx-refinement-constraints0.install
+++ b/debian/libsmtbx-refinement-constraints0.install
@@ -1,2 +1 @@
-usr/lib/libsmtbx_refinement_constraints.so.0
-usr/lib/libsmtbx_refinement_constraints.so.0.0.0
+usr/lib/*/libsmtbx_refinement_constraints.so.*
diff --git a/debian/libspotfinder0.install b/debian/libspotfinder0.install
index 3edb0b7..d7650f4 100644
--- a/debian/libspotfinder0.install
+++ b/debian/libspotfinder0.install
@@ -1,2 +1 @@
-usr/lib/libspotfinder.so.0
-usr/lib/libspotfinder.so.0.0.0
+usr/lib/*/libspotfinder.so.*
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 67ff303..c996e90 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
@@ -20,8 +20,8 @@ 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 | 79 +++++-
- cctbx_sources/libtbx/env_config.py | 21 ++
+ cctbx_sources/libtbx/SConscript | 80 +++++-
+ cctbx_sources/libtbx/env_config.py | 30 +++
cctbx_sources/mmtbx/den/SConscript | 2 +-
cctbx_sources/mmtbx/geometry_restraints/SConscript | 2 +-
cctbx_sources/mmtbx/secondary_structure/SConscript | 2 +-
@@ -31,7 +31,7 @@ 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 +-
- 28 files changed, 412 insertions(+), 267 deletions(-)
+ 28 files changed, 422 insertions(+), 267 deletions(-)
diff --git a/cctbx_sources/boost_adaptbx/SConscript b/cctbx_sources/boost_adaptbx/SConscript
index 866b1c1..ed21fb4 100644
@@ -863,7 +863,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..a1580f7 100644
+index debf569..a74442f 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -4,7 +4,7 @@ from libtbx import easy_run
@@ -875,7 +875,7 @@ index debf569..a1580f7 100644
op = os.path
if (hasattr(Environment, "Clone")):
-@@ -1018,4 +1018,81 @@ def enable_cuda_if_possible():
+@@ -1018,4 +1018,82 @@ def enable_cuda_if_possible():
enable_openmp_if_possible()
enable_cuda_if_possible()
@@ -911,9 +911,10 @@ index debf569..a1580f7 100644
+
+env_etc.prefix = libtbx.env.build_options.install_prefix
+env_etc.destdir = libtbx.env.build_options.install_destdir
++env_etc.libdir = libtbx.env.build_options.libdir
+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.join(env_etc.install_path, 'lib')
++env_etc.libpath = os.path.abspath(env_etc.install_path + '/' + env_etc.libdir)
+env_etc.inclpath = os.path.join(env_etc.install_path, 'include')
+env_etc.rpath = os.path.join(env_etc.prefix, 'lib')
+
@@ -958,40 +959,43 @@ index debf569..a1580f7 100644
+
Export("env_base", "env_etc")
diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
-index c3e1c7d..5efad84 100644
+index c3e1c7d..3284148 100644
--- a/cctbx_sources/libtbx/env_config.py
+++ b/cctbx_sources/libtbx/env_config.py
-@@ -701,6 +701,9 @@ Wait for the command to finish, then try again.""" % vars())
+@@ -701,6 +701,10 @@ 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,
+ use_system_libs=command_line.options.use_system_libs,
+ install_prefix=command_line.options.install_prefix,
++ libdir=command_line.options.libdir,
+ install_destdir=command_line.options.install_destdir,
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 +1762,9 @@ class build_options:
+@@ -1759,6 +1763,10 @@ class build_options:
warning_level,
static_libraries,
static_exe,
+ use_system_libs,
+ install_prefix,
++ libdir,
+ install_destdir,
scan_boost,
write_full_flex_fwd_h=default_write_full_flex_fwd_h,
build_boost_python_extensions=default_build_boost_python_extensions,
-@@ -1822,6 +1828,9 @@ class build_options:
+@@ -1822,6 +1830,10 @@ 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
+ print >> f, "Use System Libraries:", self.use_system_libs
+ print >> f, "Install Prefix:", self.install_prefix
++ print >> f, "Libdir:", self.libdir
+ print >> f, "Install Destdir:", self.install_destdir
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 +1949,18 @@ class pre_process_args:
+@@ -1940,6 +1952,24 @@ class pre_process_args:
action="store_true",
default=False,
help="link all executables statically (implies --static_libraries)")
@@ -1001,6 +1005,12 @@ index c3e1c7d..5efad84 100644
+ default="",
+ help="sets the destdir for the install targets.",
+ metavar="DIRECTORY")
++ parser.option(None, "--libdir",
++ type="string",
++ action="store",
++ default="lib",
++ help="sets the libdir relative to the PREFIX for the install targets. Default: lib",
++ metavar="DIRECTORY")
+ parser.option(None, "--install_prefix",
+ type="string",
+ action="store",
diff --git a/debian/patches/0007-adding-shlib-versioning.patch b/debian/patches/0007-adding-shlib-versioning.patch
index b721969..82b67b3 100644
--- a/debian/patches/0007-adding-shlib-versioning.patch
+++ b/debian/patches/0007-adding-shlib-versioning.patch
@@ -4,9 +4,9 @@ Subject: adding-shlib-versioning
---
cctbx_sources/boost_adaptbx/SConscript | 3 +
- cctbx_sources/libtbx/SConscript | 113 +++++++++++++++++++++++++++++---
+ cctbx_sources/libtbx/SConscript | 115 +++++++++++++++++++++++++++++---
cctbx_sources/libtbx/env_config.py | 7 ++
- 3 files changed, 115 insertions(+), 8 deletions(-)
+ 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
@@ -23,13 +23,16 @@ 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 a1580f7..6228bae 100644
+index a74442f..de7abea 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
-@@ -1056,14 +1056,97 @@ env_etc.libpath = os.path.join(env_etc.install_path, 'lib')
+@@ -1055,16 +1055,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')
- env_etc.rpath = os.path.join(env_etc.prefix, 'lib')
-
+-env_etc.rpath = os.path.join(env_etc.prefix, 'lib')
++env_etc.rpath = os.path.abspath(env_etc.prefix + '/' + env_etc.libdir)
++
+def set_libtool(env):
+ # Versioning can be provided by appending "-version-info 3:12:1" to SHLINKFLAGS
+ # Please see:
@@ -114,7 +117,7 @@ index a1580f7..6228bae 100644
+ if '-shared' in env_etc.shlinkflags:
+ env_etc.shlinkflags.remove('-shared')
+ env_etc.set_libtool(env_base)
-+
+
def create_install_targets():
cwd = os.getcwd()
rp = libtbx.env.repository_paths
@@ -127,7 +130,7 @@ index a1580f7..6228bae 100644
rp = list(rp)
rp.append(lib_dir)
rp.append(include_path)
-@@ -1075,17 +1158,31 @@ def create_install_targets():
+@@ -1076,17 +1159,31 @@ def create_install_targets():
os.chdir(src_dir)
dest = None
for root, dirnames, filenames in os.walk('.'):
@@ -165,34 +168,34 @@ index a1580f7..6228bae 100644
env_base.Install(dest, Glob('%s/*'%(exe_dev)))
env_base.Alias("install-bin", dest)
diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
-index 5efad84..e1cc775 100644
+index 3284148..bd96147 100644
--- a/cctbx_sources/libtbx/env_config.py
+++ b/cctbx_sources/libtbx/env_config.py
-@@ -704,6 +704,7 @@ Wait for the command to finish, then try again.""" % vars())
- use_system_libs=command_line.options.use_system_libs,
+@@ -705,6 +705,7 @@ Wait for the command to finish, then try again.""" % vars())
install_prefix=command_line.options.install_prefix,
+ libdir=command_line.options.libdir,
install_destdir=command_line.options.install_destdir,
+ libtoolize=command_line.options.libtoolize,
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
-@@ -1765,6 +1766,7 @@ class build_options:
- use_system_libs,
+@@ -1767,6 +1768,7 @@ class build_options:
install_prefix,
+ libdir,
install_destdir,
+ libtoolize,
scan_boost,
write_full_flex_fwd_h=default_write_full_flex_fwd_h,
build_boost_python_extensions=default_build_boost_python_extensions,
-@@ -1828,6 +1830,7 @@ class build_options:
+@@ -1830,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
+ print >> f, "Libtoolize:", self.libtoolize
print >> f, "Use System Libraries:", self.use_system_libs
print >> f, "Install Prefix:", self.install_prefix
- print >> f, "Install Destdir:", self.install_destdir
-@@ -1961,6 +1964,10 @@ class pre_process_args:
+ print >> f, "Libdir:", self.libdir
+@@ -1970,6 +1973,10 @@ class pre_process_args:
default="/usr/local",
help="sets the prefix for the install targets. Default: /usr/local",
metavar="DIRECTORY")
diff --git a/debian/patches/0008-add-with_pycbf-option.patch b/debian/patches/0008-add-with_pycbf-option.patch
index a8c411b..af2dc58 100644
--- a/debian/patches/0008-add-with_pycbf-option.patch
+++ b/debian/patches/0008-add-with_pycbf-option.patch
@@ -29,7 +29,7 @@ index 334cfc2..04f227a 100644
Export("env_cbflib_boost_python_ext")
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index 6228bae..f757775 100644
+index de7abea..221082b 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -1048,6 +1048,7 @@ else:
@@ -39,9 +39,9 @@ index 6228bae..f757775 100644
+env_etc.with_pycbf = libtbx.env.build_options.with_pycbf
env_etc.prefix = libtbx.env.build_options.install_prefix
env_etc.destdir = libtbx.env.build_options.install_destdir
- env_etc.install_path = os.path.abspath(env_etc.destdir + '/' + env_etc.prefix)
+ env_etc.libdir = libtbx.env.build_options.libdir
diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
-index e1cc775..7c0cbc4 100644
+index bd96147..76367bc 100644
--- a/cctbx_sources/libtbx/env_config.py
+++ b/cctbx_sources/libtbx/env_config.py
@@ -702,6 +702,7 @@ Wait for the command to finish, then try again.""" % vars())
@@ -50,17 +50,17 @@ index e1cc775..7c0cbc4 100644
use_system_libs=command_line.options.use_system_libs,
+ with_pycbf=command_line.options.with_pycbf,
install_prefix=command_line.options.install_prefix,
+ libdir=command_line.options.libdir,
install_destdir=command_line.options.install_destdir,
- libtoolize=command_line.options.libtoolize,
-@@ -1764,6 +1765,7 @@ class build_options:
+@@ -1765,6 +1766,7 @@ class build_options:
static_libraries,
static_exe,
use_system_libs,
+ with_pycbf,
install_prefix,
+ libdir,
install_destdir,
- libtoolize,
-@@ -1952,6 +1954,14 @@ class pre_process_args:
+@@ -1955,6 +1957,14 @@ class pre_process_args:
action="store_true",
default=False,
help="link all executables statically (implies --static_libraries)")
diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index 1b66bae..a77e4b7 100644
--- a/debian/patches/0010-adding-setup_py.patch
+++ b/debian/patches/0010-adding-setup_py.patch
@@ -5,8 +5,8 @@ Subject: adding-setup_py
---
cctbx_sources/stdlib.py | 4 +
sconsutils.py | 408 +++++++++++++++++++++++++++++++++++++++++++++++
- setup.py | 130 +++++++++++++++
- 3 files changed, 542 insertions(+)
+ setup.py | 133 +++++++++++++++
+ 3 files changed, 545 insertions(+)
create mode 100755 cctbx_sources/stdlib.py
create mode 100644 sconsutils.py
create mode 100755 setup.py
@@ -437,10 +437,10 @@ index 0000000..0b82bdd
+ return out, list(outext)
diff --git a/setup.py b/setup.py
new file mode 100755
-index 0000000..455e43e
+index 0000000..08f7a31
--- /dev/null
+++ b/setup.py
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,133 @@
+from distutils.core import setup, Extension
+from distutils.util import convert_path
+import sys, os, shutil
@@ -474,6 +474,8 @@ index 0000000..455e43e
+
+sconsutils.SRCDIR = SRCDIR
+
++# Debian Multiarch magic
++multiarch = os.environ.get('DEB_HOST_MULTIARCH')
+# Configure settings
+# We need this directory to get env_config.cold_start to run!
+# trailing slash is important
@@ -481,6 +483,7 @@ index 0000000..455e43e
+build_opts = [ '--libtoolize',
+ '--use_system_libs',
+ '--use-environment-flags',
++ '--libdir', 'lib/' + multiarch,
+ '--install_prefix', '%PREFIX%', # prefix will be replaced at run time
+ ]
+conf_modules = [ 'annlib_adaptbx',
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 f158f4c..6a331cb 100644
--- a/debian/patches/0011-fix-missing-python-lib-during-linking.patch
+++ b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
@@ -8,7 +8,7 @@ Subject: fix missing python lib during linking
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
-index f757775..9c28be9 100644
+index 221082b..fdb757b 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -54,9 +54,11 @@ def set_python_include_and_libs(env_etc):
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 55d1375..6b859e2 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 9c28be9..7c7471d 100644
+index fdb757b..830e0ad 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -777,11 +777,15 @@ else:
@@ -37,7 +37,7 @@ index 9c28be9..7c7471d 100644
env_base_sync_with_env_etc()
if (static_exe):
-@@ -1065,8 +1072,10 @@ def set_libtool(env):
+@@ -1066,8 +1073,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']
@@ -50,10 +50,10 @@ index 9c28be9..7c7471d 100644
SHLIBSUFFIX='.la',
)
diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
-index 7c0cbc4..82dd261 100644
+index 76367bc..c5dbb80 100644
--- a/cctbx_sources/libtbx/env_config.py
+++ b/cctbx_sources/libtbx/env_config.py
-@@ -1803,6 +1803,7 @@ class build_options:
+@@ -1805,6 +1805,7 @@ class build_options:
self.env_cxxflags = ""
self.env_cflags = ""
self.env_cppflags = ""
@@ -61,7 +61,7 @@ index 7c0cbc4..82dd261 100644
flg = os.environ.get("CXXFLAGS")
if flg is not None:
self.env_cxxflags = flg
-@@ -1812,6 +1813,9 @@ class build_options:
+@@ -1814,6 +1815,9 @@ class build_options:
flg = os.environ.get("CPPFLAGS")
if flg is not None:
self.env_cppflags = flg
@@ -71,7 +71,7 @@ index 7c0cbc4..82dd261 100644
def report(self, f=None):
if (f is None): f = sys.stdout
-@@ -1842,6 +1846,7 @@ class build_options:
+@@ -1845,6 +1849,7 @@ class build_options:
print >>f, " CXXFLAGS = ", self.env_cxxflags
print >>f, " CFLAGS = ", self.env_cflags
print >>f, " CPPFLAGS = ", self.env_cppflags
@@ -79,7 +79,7 @@ index 7c0cbc4..82dd261 100644
class include_registry:
-@@ -1997,7 +2002,7 @@ class pre_process_args:
+@@ -2006,7 +2011,7 @@ class pre_process_args:
action="store_true",
default=False,
help="add compiler flags from environment variables: CXXFLAGS, CFLAGS,"
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 e5e5f45..4f979e5 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 7c7471d..dcd888a 100644
+index 830e0ad..6925fbc 100644
--- a/cctbx_sources/libtbx/SConscript
+++ b/cctbx_sources/libtbx/SConscript
@@ -798,6 +798,8 @@ else:
diff --git a/debian/rules b/debian/rules
index 4763977..de51e26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,9 @@ export DH_VERBOSE=1
# This has to be exported to make some magic below work.
export DH_OPTIONS
+# Multiarch
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
PYDEF = $(shell pyversions -vd)
PYVERS = $(shell pyversions -vr)
srcdir = cctbx_sources
--
Packaging for cctbx
More information about the debian-science-commits
mailing list