[SCM] Core functionality for performing astronomy and astrophysics with Python branch, debian, updated. afe7a985bba81acc03cfb12900839e0c34866437
Ole Streicher
debian at liska.ath.cx
Fri Feb 15 08:03:01 UTC 2013
The following commit has been merged in the debian branch:
commit afe7a985bba81acc03cfb12900839e0c34866437
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Feb 15 09:02:15 2013 +0100
Add default libraries to the list if the pkg-config lookup fails
diff --git a/debian/patches/Add_default_libs.patch b/debian/patches/Add_default_libs.patch
new file mode 100644
index 0000000..0668a68
--- /dev/null
+++ b/debian/patches/Add_default_libs.patch
@@ -0,0 +1,22 @@
+--- a/astropy/setup_helpers.py
++++ b/astropy/setup_helpers.py
+@@ -1318,8 +1318,17 @@
+ log.warn('\n'.join(lines))
+ libraries.extend(default_libraries)
+ else:
+- for token in output.split():
+- locals()[flag_map.get(token[:2])].append(token[2:])
++ if pipe.returncode != 0:
++ lines = [
++ "pkg-config could not lookup up package(s) {0}.".format(
++ ", ".join(packages)),
++ "This may cause the build to fail below."
++ ]
++ log.warn('\n'.join(lines))
++ libraries.extend(default_libraries)
++ else:
++ for token in output.split():
++ locals()[flag_map.get(token[:2])].append(token[2:])
+
+
+ def add_external_library(library):
diff --git a/debian/patches/series b/debian/patches/series
index 6783f67..ab317fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+Add_default_libs.patch
fix_sphinxbuild.patch
--
Core functionality for performing astronomy and astrophysics with Python
More information about the debian-science-commits
mailing list