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.
ci/unstable
Mattia Rizzolo 6 years ago committed by Felix Geyer
parent d209a4e6e3
commit 6ebc8f49e3

8
debian/changelog vendored

@ -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 <mattia@debian.org> Thu, 27 Sep 2018 17:50:12 +0200
cmake (3.12.1-1) unstable; urgency=medium cmake (3.12.1-1) unstable; urgency=medium
* New upstream release. * New upstream release.

1
debian/control vendored

@ -5,6 +5,7 @@ Maintainer: Debian CMake Team <pkg-cmake-team@lists.alioth.debian.org>
Uploaders: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>, Uploaders: Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
Felix Geyer <fgeyer@debian.org> Felix Geyer <fgeyer@debian.org>
Build-Depends: debhelper (>= 10~), Build-Depends: debhelper (>= 10~),
freebsd-glue [kfreebsd-any],
libarchive-dev (>= 2.8.0), libarchive-dev (>= 2.8.0),
libbz2-dev, libbz2-dev,
libcurl4-openssl-dev | libcurl-ssl-dev, libcurl4-openssl-dev | libcurl-ssl-dev,

@ -0,0 +1,23 @@
Description: Add missing libraries for kFreeBSD.
Author: Gregor Jasny <gjasny@googlemail.com>
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

@ -1,2 +1,3 @@
FindBoost_add_-lpthread_#563479.diff FindBoost_add_-lpthread_#563479.diff
fix-ftbfs-on-kfreebsd.patch fix-ftbfs-on-kfreebsd.patch
fix_ftbfs_on_kfreebsd2.patch

Loading…
Cancel
Save