freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

security/openconnect-gui: fix build ahead of CMake 3.20

Browse Source 
The use of --build and --target is more strict in CMake 3.20,
and it looks like it needs to be specified explicitly in more
cases than before when dealing with externals. Avoid --target install
though because that will install /wrkdirs into stage, which makes
a big mess.
This commit is contained in:
Adriaan de Groot
2021-04-16 00:08:36 +02:00
parent 6664a69db4
commit e44d8d345d
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
security/openconnect-gui/Makefile
View File

@@ -2,6 +2,7 @@
PORTNAME= openconnect-gui
PORTVERSION= 1.5.3
PORTREVISION= 1
DISTVERSIONPREFIX=v
MASTER_SITES= https://gitlab.com/openconnect/openconnect-gui/-/archive/v${PORTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

6
security/openconnect-gui/files/patch-CMake_Includes_ProjectExternals__qt-solutions.cmake
View File

@@ -1,6 +1,6 @@
--- CMake/Includes/ProjectExternals_qt-solutions.cmake.orig 2018-03-25 21:49:15 UTC
+++ CMake/Includes/ProjectExternals_qt-solutions.cmake
@@ -9,10 +9,7 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
@@ -9,11 +9,9 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
UPDATE_DISCONNECTED 0
UPDATE_COMMAND ""
@@ -10,9 +10,11 @@
-
+ SOURCE_DIR ${CMAKE_BINARY_DIR}/external/src/qt-solutions-master
BUILD_IN_SOURCE 1
+ BUILD_COMMAND ${CMAKE_COMMAND} --build .
PATCH_COMMAND ${CMAKE_COMMAND} -E copy_if_different
@@ -21,14 +18,14 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
${CMAKE_SOURCE_DIR}/CMake/Includes/CMakeLists_qt-solutions.cmake.in
@@ -21,14 +19,14 @@ ExternalProject_Add(qt-solutions-${qt-solutions-TAG}
CMAKE_COMMAND ${CMAKE_CROSS_COMMAND} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
# Note: ninja-1.8.2 & cmake-3.10.2 failed in find/install this dependency wo next 2 lines :(