[SCM] ESO library for automated astronomical data-reduction branch, debian, updated. upstream/5.3.1-51-g1d427c7

[Ole Streicher]

The following commit has been merged in the debian branch:
commit 1d427c741ec4388f90b6890cd530c883ecece67d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 18 17:18:18 2012 +0200

    Remove compile-time estimation of L2 cache size

diff --git a/debian/changelog b/debian/changelog
index 76226fa..8c89669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (6.1.1-2) UNRELEASED; urgency=low
+
+  * Remove compile-time estimation of L2 cache size
+
+ -- Ole Streicher <debian at liska.ath.cx>  Mon, 18 Jun 2012 17:17:08 +0200
+
 cpl (6.1.1-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/no_compiletime_cpucheck.patch b/debian/patches/no_compiletime_cpucheck.patch
new file mode 100644
index 0000000..eb12a84
--- /dev/null
+++ b/debian/patches/no_compiletime_cpucheck.patch
@@ -0,0 +1,16 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: On Linux machines, CPL_CHECK_CPU checks the CPU 2nd level 
+ cache during compile time for some obscure code optimizations. In a
+ distribution, the produced code should be independent of the build
+ environment, so we use the default here which works well for non-Linux
+ platforms. The performance loss is probably negleglible.
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,6 @@
+ CPL_EXPORT_DIRS(htmldir)
+ 
+ CPL_CHECK_MEMORYMODE
+-CPL_CHECK_CPU
+ 
+ CPL_ENABLE_GASGANO
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f1d0517..930e0ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ use-std-paths-for-libs.patch
 remove-private-ltdl.patch
 build-cpljava.patch
 loose_cplfit_test.patch
+no_compiletime_cpucheck.patch

-- 
ESO library for automated astronomical data-reduction