Control: tags 869990 + patch
Control: tags 869990 + pending
Dear maintainer,
I've prepared an NMU for madness (versioned as 0.10.1~gite4aa500e-10.1)
and uploaded it to DELAYED/10. Please feel free to tell me if I should
cancel it.
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
diff -Nru madness-0.10.1~gite4aa500e/debian/changelog madness-0.10.1~gite4aa500e/debian/changelog
--- madness-0.10.1~gite4aa500e/debian/changelog 2016-12-30 19:02:22.000000000 +0200
+++ madness-0.10.1~gite4aa500e/debian/changelog 2018-04-20 22:29:45.000000000 +0300
@@ -1,3 +1,10 @@
+madness (0.10.1~gite4aa500e-10.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with >= 3.9.0. (Closes: #869990)
+
+ -- Adrian Bunk <b...@debian.org> Fri, 20 Apr 2018 22:29:45 +0300
+
madness (0.10.1~gite4aa500e-10) unstable; urgency=medium
* debian/patches/disable_pie.patch: New patch, disables PIE, taken from
diff -Nru madness-0.10.1~gite4aa500e/debian/patches/cmake_else.patch madness-0.10.1~gite4aa500e/debian/patches/cmake_else.patch
--- madness-0.10.1~gite4aa500e/debian/patches/cmake_else.patch 1970-01-01 02:00:00.000000000 +0200
+++ madness-0.10.1~gite4aa500e/debian/patches/cmake_else.patch 2018-04-20 22:29:45.000000000 +0300
@@ -0,0 +1,14 @@
+Description: CMake >= 3.9.0 rejects duplicate else
+Author: Adrian Bunk <b...@debian.org>
+
+--- madness-0.10.1~gite4aa500e.orig/cmake/modules/FindMKL.cmake
++++ madness-0.10.1~gite4aa500e/cmake/modules/FindMKL.cmake
+@@ -38,7 +38,7 @@ if(NOT MKL_FOUND)
+
+ if(FORTRAN_INTEGER_SIZE EQUAL 4)
+ set(MKL_INT_TYPE "lp64")
+- else(FORTRAN_INTEGER_SIZE EQUAL 8)
++ elseif(FORTRAN_INTEGER_SIZE EQUAL 8)
+ set(MKL_INT_TYPE "ilp64")
+ else()
+ set(MKL_INT_TYPE "lp64")
diff -Nru madness-0.10.1~gite4aa500e/debian/patches/series madness-0.10.1~gite4aa500e/debian/patches/series
--- madness-0.10.1~gite4aa500e/debian/patches/series 2016-12-30 11:27:24.000000000 +0200
+++ madness-0.10.1~gite4aa500e/debian/patches/series 2018-04-20 22:29:26.000000000 +0300
@@ -3,3 +3,4 @@
relax_tbb_version_check.patch
cmake_mraplot_install.patch
disable_pie.patch
+cmake_else.patch
