From 6ebc8f49e3b574bd6163d3feadce9253e1b731af Mon Sep 17 00:00:00 2001 From: Mattia Rizzolo Date: Thu, 27 Sep 2018 17:50:12 +0200 Subject: [PATCH] Import Debian changes 3.12.1-1.1 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. --- debian/changelog | 8 +++++++ debian/control | 1 + debian/patches/fix_ftbfs_on_kfreebsd2.patch | 23 +++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 33 insertions(+) create mode 100644 debian/patches/fix_ftbfs_on_kfreebsd2.patch diff --git a/debian/changelog b/debian/changelog index 57488f936..e2f158091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 27 Sep 2018 17:50:12 +0200 + cmake (3.12.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index 75d3a0875..0431dfa22 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,7 @@ Maintainer: Debian CMake Team Uploaders: Lisandro Damián Nicanor Pérez Meyer , Felix Geyer Build-Depends: debhelper (>= 10~), + freebsd-glue [kfreebsd-any], libarchive-dev (>= 2.8.0), libbz2-dev, libcurl4-openssl-dev | libcurl-ssl-dev, diff --git a/debian/patches/fix_ftbfs_on_kfreebsd2.patch b/debian/patches/fix_ftbfs_on_kfreebsd2.patch new file mode 100644 index 000000000..cbc81bb1a --- /dev/null +++ b/debian/patches/fix_ftbfs_on_kfreebsd2.patch @@ -0,0 +1,23 @@ +Description: Add missing libraries for kFreeBSD. +Author: Gregor Jasny +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 --git a/debian/patches/series b/debian/patches/series index eba29532d..fb5cb2700 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ FindBoost_add_-lpthread_#563479.diff fix-ftbfs-on-kfreebsd.patch +fix_ftbfs_on_kfreebsd2.patch