Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix info and man page install directories on kFreeBSD.

Browse Source 
* Fix info and man page install directories on kFreeBSD. (Closes: #911700)
  - Add GNUInstallDirs-kfreebsd-man.patch
This commit is contained in:
Felix Geyer 2018-10-28 12:06:00 +01:00
parent 0f9985d923
commit 0c3aa46e7d
3 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
cmake (3.12.3-3) unstable; urgency=medium
* Fix info and man page install directories on kFreeBSD. (Closes: #911700)
- Add GNUInstallDirs-kfreebsd-man.patch
-- Felix Geyer <fgeyer@debian.org> Sun, 28 Oct 2018 12:05:32 +0100
cmake (3.12.3-2) unstable; urgency=medium
* Increase timeout of tests from 2000s to 5000s. (Closes: #910513)

36
debian/patches/GNUInstallDirs-kfreebsd-man.patch vendored Normal file
View File

@ -0,0 +1,36 @@
From b2d7ab8bd17d0b5ccb1760e1058e670cea8eed49 Mon Sep 17 00:00:00 2001
From: James Clarke <jrtc27@jrtc27.com>
Date: Sun, 21 Oct 2018 09:59:11 +0100
Subject: [PATCH] GNUInstallDirs: Don't use BSD info and man paths on
GNU/kFreeBSD
---
Modules/GNUInstallDirs.cmake | 2 +-
Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
index 9dd464c8de..3dfcf8c959 100644
--- a/Modules/GNUInstallDirs.cmake
+++ b/Modules/GNUInstallDirs.cmake
@@ -276,7 +276,7 @@ _GNUInstallDirs_cache_path(CMAKE_INSTALL_DATAROOTDIR "share"
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_DATADIR "${CMAKE_INSTALL_DATAROOTDIR}"
"Read-only architecture-independent data (DATAROOTDIR)")
-if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_INFODIR "info"
"Info documentation (info)")
_GNUInstallDirs_cache_path_fallback(CMAKE_INSTALL_MANDIR "man"
diff --git a/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake b/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
index b544ba6400..e00af581bc 100644
--- a/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
+++ b/Tests/RunCMake/GNUInstallDirs/RunCMakeTest.cmake
@@ -1,6 +1,6 @@
include(RunCMake)
-if(SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+if(SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$")
set(EXPECT_BSD 1)
endif()

1
debian/patches/series vendored
View File

@ -2,3 +2,4 @@ FindBoost_add_-lpthread_#563479.diff
fix-ftbfs-on-kfreebsd.patch
fix_ftbfs_on_kfreebsd2.patch
hurd_so_noexec.patch
GNUInstallDirs-kfreebsd-man.patch