svn commit: r541879 - head/security/yubico-piv-tool/files

[Craig Leres]

On 2020-07-10 11:40, Hajimu UMEMOTO wrote:
> Author: ume
> Date: Fri Jul 10 18:40:04 2020
> New Revision: 541879
> URL: https://svnweb.freebsd.org/changeset/ports/541879
> 
> Log:
>    Add required patch to update
> 
> Added:
>    head/security/yubico-piv-tool/files/
>    head/security/yubico-piv-tool/files/patch-CMakeLists.txt   (contents, props changed)
> 
> Added: head/security/yubico-piv-tool/files/patch-CMakeLists.txt
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/security/yubico-piv-tool/files/patch-CMakeLists.txt	Fri Jul 10 18:40:04 2020	(r541879)
> @@ -0,0 +1,15 @@
> +--- CMakeLists.txt.orig	2020-07-10 13:45:10 UTC
> ++++ CMakeLists.txt
> +@@ -121,9 +121,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
> +     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
> + endif()
> +
> +-include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
> +-find_libcrypto()
> +-include_directories(${LIBCRYPTO_INCLUDE_DIRS})
> ++# include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
> ++# find_libcrypto()
> ++# include_directories(${LIBCRYPTO_INCLUDE_DIRS})
> +
> + enable_testing()
> + find_package(codecov)

This patch breaks building for me with DEFAULT_VERSIONS=ssl=openssl; the 
attached solves this on 11.3 with ssl=openssl and 12.1 with ssl=base.

I'm happy to submit a PR if you'd rather address this that way.

		Craig

-------------- next part --------------
Index: security/yubico-piv-tool/Makefile
===================================================================
--- security/yubico-piv-tool/Makefile	(revision 542124)
+++ security/yubico-piv-tool/Makefile	(working copy)
@@ -41,6 +41,10 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${SSL_DEFAULT} != base
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-CMakeLists.txt
+.endif
+
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 post-patch:
 	@${REINPLACE_CMD} -e '/#pragma GCC diagnostic/d' \
Index: security/yubico-piv-tool/files/extra-patch-CMakeLists.txt
===================================================================
Index: security/yubico-piv-tool/files/patch-CMakeLists.txt
===================================================================
--- security/yubico-piv-tool/files/patch-CMakeLists.txt	(revision 542124)
+++ security/yubico-piv-tool/files/patch-CMakeLists.txt	(nonexistent)
@@ -1,15 +0,0 @@
---- CMakeLists.txt.orig	2020-07-10 13:45:10 UTC
-+++ CMakeLists.txt
-@@ -121,9 +121,9 @@ if(CMAKE_COMPILER_IS_GNUCC)
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-result")
- endif()
- 
--include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
--find_libcrypto()
--include_directories(${LIBCRYPTO_INCLUDE_DIRS})
-+# include(${CMAKE_SOURCE_DIR}/cmake/openssl.cmake)
-+# find_libcrypto()
-+# include_directories(${LIBCRYPTO_INCLUDE_DIRS})
- 
- enable_testing()
- find_package(codecov)

Property changes on: security/yubico-piv-tool/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property