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

Radostan Riedel raybuntu at googlemail.com
Thu Jul 19 21:45:44 UTC 2012


The following commit has been merged in the master branch:
commit 6474041fd21e34f221b28d7b51798ea15447c59f
Author: Radostan Riedel <raybuntu at googlemail.com>
Date:   Thu Jul 19 23:29:46 2012 +0200

    Fix gcc4.7 bug where -lpython is missing

diff --git a/debian/patches/0011-fix-missing-python-lib-during-linking.patch b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
new file mode 100644
index 0000000..d6576d2
--- /dev/null
+++ b/debian/patches/0011-fix-missing-python-lib-during-linking.patch
@@ -0,0 +1,22 @@
+From: Radostan Riedel <raybuntu at googlemail.com>
+Date: Thu, 19 Jul 2012 23:26:30 +0200
+Subject: fix missing python lib during linking
+
+---
+ cctbx_sources/libtbx/SConscript |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cctbx_sources/libtbx/SConscript b/cctbx_sources/libtbx/SConscript
+index b97390f..c1baf7d 100644
+--- a/cctbx_sources/libtbx/SConscript
++++ b/cctbx_sources/libtbx/SConscript
+@@ -56,7 +56,7 @@ def set_python_include_and_libs(env_etc):
+     env_etc.libs_python = ["python" + sys.version[0] + sys.version[2]]
+     env_etc.libpath_python = [sys.prefix + r"\libs"]
+   else:
+-    env_etc.libs_python = []
++    env_etc.libs_python = ["python%s.%s"%(sys.version[0], sys.version[2])]
+     env_etc.libpath_python = []
+   if (env_etc.compiler.startswith("darwin_")):
+     env_etc.python_framework = "/".join(
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index e6f8210..0b85700 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0008-add-with_pycbf-option.patch
 0009-build-libann-statically.patch
 0010-adding-setup_py.patch
+0011-fix-missing-python-lib-during-linking.patch

-- 
Packaging for cctbx



More information about the debian-science-commits mailing list