[SCM] Packaging for cctbx branch, master, updated. upstream/2012.05.08.2305-45-g7750fe7
Radostan Riedel
raybuntu at googlemail.com
Tue Jul 24 21:59:22 UTC 2012
The following commit has been merged in the master branch:
commit e853624bfdaff5ec15c4c64ecf26c763ca84ac82
Author: Radostan Riedel <raybuntu at googlemail.com>
Date: Tue Jul 24 17:13:48 2012 +0200
Fix to use dpkg-buildflags
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index b51d6d7..a61b8e8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Radostan Riedel <raybuntu at googlemail.com>
Section: science
Priority: extra
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
python-all-dev,
libfftw3-dev,
libcbf-dev,
diff --git a/debian/patches/0010-adding-setup_py.patch b/debian/patches/0010-adding-setup_py.patch
index fb27334..6f907fc 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 | 155 +++++++++++++++++++++++++++++++++++++++++++++++
- setup.py | 122 +++++++++++++++++++++++++++++++++++++
- 3 files changed, 281 insertions(+)
+ setup.py | 123 +++++++++++++++++++++++++++++++++++++
+ 3 files changed, 282 insertions(+)
create mode 100755 cctbx_sources/stdlib.py
create mode 100644 sconsutils.py
create mode 100755 setup.py
@@ -184,10 +184,10 @@ index 0000000..07d393d
+ return out, list(outext)
diff --git a/setup.py b/setup.py
new file mode 100755
-index 0000000..c260365
+index 0000000..fd5cd34
--- /dev/null
+++ b/setup.py
-@@ -0,0 +1,122 @@
+@@ -0,0 +1,123 @@
+from distutils.core import setup, Extension
+import sys, os, shutil
+
@@ -224,6 +224,7 @@ index 0000000..c260365
+init_dir = opj(BUILDDIR, SRCDIR, 'libtbx/')
+build_opts = [ '--libtoolize',
+ '--use_system_libs',
++ '--use-environment-flags',
+ '--install_prefix', PREFIX,
+ ]
+conf_modules = [ 'annlib_adaptbx',
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
new file mode 100644
index 0000000..620740d
--- /dev/null
+++ b/debian/patches/0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch
@@ -0,0 +1,91 @@
+From: Radostan Riedel <raybuntu at googlemail.com>
+Date: Tue, 24 Jul 2012 17:12:30 +0200
+Subject: fix to support LDFLAGS in use_enviroment_flags
+
+---
+ cctbx_sources/libtbx/SConscript | 11 ++++++++++-
+ cctbx_sources/libtbx/env_config.py | 7 ++++++-
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
+index 9c28be9..7c7471d 100644
+--- a/cctbx_sources/libtbx/SConscript
++++ b/cctbx_sources/libtbx/SConscript
+@@ -777,11 +777,15 @@ else:
+ # user options for any compiler from the environment variables
+ # at the time of configure
+ opts = libtbx.env.build_options
++ env_etc.ldflags_base = []
+ if( opts.use_environment_flags ):
+ print "libtbx.scons: using flags from initial environment: "
+ print " CXXFLAGS = ", opts.env_cxxflags
+ print " CFLAGS = ", opts.env_cflags
+ print " CPPFLAGS = ", opts.env_cppflags
++ print " LDFLAGS = ", opts.env_ldflags
++ flg = opts.env_ldflags.split(" ")
++ env_etc.ldflags_base = flg
+ flg = opts.env_cxxflags.split(" ")
+ if( hasattr(env_etc, "cxxflags_base") ):
+ env_etc.cxxflags_base.extend(flg)
+@@ -853,6 +857,9 @@ def env_base_sync_with_env_etc():
+ SHCFLAGS=env_etc.cflags_base,
+ SHCCFLAGS=env_etc.ccflags_base,
+ SHCXXFLAGS=env_etc.cxxflags_base)
++ env_base.Prepend(LINKFLAGS=env_etc.ldflags_base)
++ env_etc.shlinkflags.extend(env_etc.ldflags_base)
++ env_etc.shlinkflags_bpl.extend(env_etc.ldflags_base)
+ env_base_sync_with_env_etc()
+
+ if (static_exe):
+@@ -1065,8 +1072,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']
++ sh_flg = list(env_etc.ldflags_base)
++ sh_flg.extend(['-rpath', env_etc.rpath])
+ env.Replace(
+- SHLINKFLAGS='-rpath ' + env_etc.rpath,
++ SHLINKFLAGS=sh_flg,
+ SHOBJSUFFIX='.lo',
+ SHLIBSUFFIX='.la',
+ )
+diff --git a/cctbx_sources/libtbx/env_config.py b/cctbx_sources/libtbx/env_config.py
+index 7c0cbc4..82dd261 100644
+--- a/cctbx_sources/libtbx/env_config.py
++++ b/cctbx_sources/libtbx/env_config.py
+@@ -1803,6 +1803,7 @@ class build_options:
+ self.env_cxxflags = ""
+ self.env_cflags = ""
+ self.env_cppflags = ""
++ self.env_ldflags = ""
+ flg = os.environ.get("CXXFLAGS")
+ if flg is not None:
+ self.env_cxxflags = flg
+@@ -1812,6 +1813,9 @@ class build_options:
+ flg = os.environ.get("CPPFLAGS")
+ if flg is not None:
+ self.env_cppflags = flg
++ flg = os.environ.get("LDFLAGS")
++ if flg is not None:
++ self.env_ldflags = flg
+
+ def report(self, f=None):
+ if (f is None): f = sys.stdout
+@@ -1842,6 +1846,7 @@ class build_options:
+ print >>f, " CXXFLAGS = ", self.env_cxxflags
+ print >>f, " CFLAGS = ", self.env_cflags
+ print >>f, " CPPFLAGS = ", self.env_cppflags
++ print >>f, " LDFLAGS = ", self.env_ldflags
+
+ class include_registry:
+
+@@ -1997,7 +2002,7 @@ class pre_process_args:
+ action="store_true",
+ default=False,
+ help="add compiler flags from environment variables: CXXFLAGS, CFLAGS,"
+- " CPPFLAGS")
++ " CPPFLAGS, LDFLAGS")
+ parser.option(None, "--force_32bit",
+ action="store_true",
+ default=False,
+--
diff --git a/debian/patches/series b/debian/patches/series
index 415c4d3..30dc218 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
0010-adding-setup_py.patch
0011-fix-missing-python-lib-during-linking.patch
0012-fix-to-remove-cctbx.python-interpreter.patch
+0013-fix-to-support-LDFLAGS-in-use_enviroment_flags.patch
--
Packaging for cctbx
More information about the debian-science-commits
mailing list