[SCM] ATLAS packaging for Debian branch, master, updated. upstream/3.8.4-34-gf9ed6f4

Sébastien Villemot sebastien at debian.org
Tue Jun 11 15:19:26 UTC 2013


The following commit has been merged in the master branch:
commit 34771c6efb98cfc55fe1a0fb8c29350c6bfdebce
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jun 11 15:55:08 2013 +0200

    New patch: Fixes non-threaded build
    
    This patch prevents the building of some threaded components, which otherwise
    results in missing symbols in the shared library.

diff --git a/debian/changelog b/debian/changelog
index c36bc29..dd32b18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ atlas (3.10.1-1) UNRELEASED; urgency=low
       used; this is implemented via a patch (armhf.diff) and by the use of fixed
       archdefs
   * The generic package is now built without multi-threading, because otherwise
-    the package fails to build on some single-processor machines. As a side
-    effect, the build of the custom package gracefully handles non-threaded
+    the package fails to build on some single-processor machines (this required
+    the introduction of a patch: fix-non-threaded-build.diff). As a side effect,
+    the build of the custom package gracefully handles non-threaded
     builds. (Closes: #602524)
   * Add libblas.a as slave in the libblas.so alternative (Closes: #701921)
   * Add symlinks for lib{f77blas,atlas}.a in /usr/lib (Closes: #666203)
diff --git a/debian/patches/fix-non-threaded-build.diff b/debian/patches/fix-non-threaded-build.diff
new file mode 100644
index 0000000..31340ec
--- /dev/null
+++ b/debian/patches/fix-non-threaded-build.diff
@@ -0,0 +1,23 @@
+Description: Fix non-threaded build
+ This patch prevents the building of some threaded components, which otherwise
+ results in missing symbols in the shared library.
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: no
+Last-Update: 2013-06-11
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/bin/atlas_install.c
++++ b/bin/atlas_install.c
+@@ -1075,10 +1075,12 @@
+    PrintStartStop(stdout, fpsum, 3, 1, 5, 1, 0, "FINAL STATIC LIBRARY UPDATE");
+    sprintf(ln2, "INSTALL_LOG/LIBUPDATE.LOG");
+    PrintBanner(ln2, 1, 5, 1, 1);
++#ifdef ATL_NCPU
+    sprintf(ln, "%s IBuildLibs IBuildPtlibs0 %s %s\n", fmake, redir, ln2);
+    fprintf(stdout, ln);
+    ATL_Cassert(system(ln)==0, "STATIC LIBRARY UPDATE", ln2);
+    PrintBanner(ln2, 0, 5, 1, 1);
++#endif
+    PrintStartStop(stdout, fpsum, 3, 0, 5, 1, 0, "FINAL STATIC LIBRARY UPDATE");
+ #ifdef ATL_DYLIBS
+    PrintStartStop(stdout, fpsum, 3, 1, 5, 2, 0,
diff --git a/debian/patches/series b/debian/patches/series
index d0164b5..cd01044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ shared_libraries.diff
 kfreebsd.diff
 armel-is-v4t.diff
 armhf.diff
+fix-non-threaded-build.diff

-- 
ATLAS packaging for Debian



More information about the debian-science-commits mailing list