Control: tags 905138 + pending

Dear maintainer,

I've prepared an NMU for cmake (versioned as 3.12.1-1.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.

Also, while preparing this I noticed that there is already another patch
in the packaging trying to fix a ftbfs on kbsd.  A first test showed
that it's not needed anymore; we are testing it in other environments,
and we will let you know (through a bug) if it could be dropped.


Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-
diffstat for cmake-3.12.1 cmake-3.12.1

 changelog                            |    8 ++++++++
 control                              |    1 +
 patches/fix_ftbfs_on_kfreebsd2.patch |   23 +++++++++++++++++++++++
 patches/series                       |    1 +
 4 files changed, 33 insertions(+)

diff -Nru cmake-3.12.1/debian/changelog cmake-3.12.1/debian/changelog
--- cmake-3.12.1/debian/changelog	2018-08-09 21:35:37.000000000 +0200
+++ cmake-3.12.1/debian/changelog	2018-09-27 17:50:12.000000000 +0200
@@ -1,3 +1,11 @@
+cmake (3.12.1-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add patch from upstream to fix FTBFS in kfreebsd.  Closes: #905138
+  * Add Build-Dependency on freebsd-glue on kfreebsd-any.
+
+ -- Mattia Rizzolo <[email protected]>  Thu, 27 Sep 2018 17:50:12 +0200
+
 cmake (3.12.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru cmake-3.12.1/debian/control cmake-3.12.1/debian/control
--- cmake-3.12.1/debian/control	2018-05-19 10:51:17.000000000 +0200
+++ cmake-3.12.1/debian/control	2018-09-27 17:49:10.000000000 +0200
@@ -5,6 +5,7 @@
 Uploaders: Lisandro Damián Nicanor Pérez Meyer <[email protected]>,
            Felix Geyer <[email protected]>
 Build-Depends: debhelper (>= 10~),
+               freebsd-glue [kfreebsd-any],
                libarchive-dev (>= 2.8.0),
                libbz2-dev,
                libcurl4-openssl-dev | libcurl-ssl-dev,
diff -Nru cmake-3.12.1/debian/patches/fix_ftbfs_on_kfreebsd2.patch cmake-3.12.1/debian/patches/fix_ftbfs_on_kfreebsd2.patch
--- cmake-3.12.1/debian/patches/fix_ftbfs_on_kfreebsd2.patch	1970-01-01 01:00:00.000000000 +0100
+++ cmake-3.12.1/debian/patches/fix_ftbfs_on_kfreebsd2.patch	2018-09-27 17:50:12.000000000 +0200
@@ -0,0 +1,23 @@
+Description: Add missing libraries for kFreeBSD.
+Author: Gregor Jasny <[email protected]>
+Origin: upstream, https://gitlab.kitware.com/cmake/cmake/commit/6b7b54d476a297b32f8f1521f3255052b9dda1b6
+Bug-Debian: https://bugs.debian.org/905138
+Bug: https://gitlab.kitware.com/cmake/cmake/issues/18375
+
+diff --git a/bootstrap b/bootstrap
+index 188193d9a9..416a3d6780 100755
+--- a/bootstrap
++++ b/bootstrap
+@@ -1370,6 +1370,9 @@ else
+       uv_c_flags="${uv_c_flags} -D_GNU_SOURCE"
+       libs="${libs} -ldl -lrt"
+       ;;
++    *kFreeBSD*)
++      libs="${libs} -lkvm -lfreebsd-glue"
++      ;;
+     *BSD*)
+       libs="${libs} -lkvm"
+       ;;
+-- 
+2.18.0
+
diff -Nru cmake-3.12.1/debian/patches/series cmake-3.12.1/debian/patches/series
--- cmake-3.12.1/debian/patches/series	2018-08-09 18:15:04.000000000 +0200
+++ cmake-3.12.1/debian/patches/series	2018-09-27 17:47:32.000000000 +0200
@@ -1,2 +1,3 @@
 FindBoost_add_-lpthread_#563479.diff
 fix-ftbfs-on-kfreebsd.patch
+fix_ftbfs_on_kfreebsd2.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to