Date: Mon, 16 Oct 2023 16:49:12 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2a1f1b7c3664 - main - security/libfido2: Simplified Makefile Message-ID: <202310161649.39GGnCbj011985@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a1f1b7c3664cde187ac5b507b6a5a1ba18a1daf commit 2a1f1b7c3664cde187ac5b507b6a5a1ba18a1daf Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-10-16 16:48:54 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-10-16 16:48:54 +0000 security/libfido2: Simplified Makefile OPENSSL_API_COMPAT=0x10101000L can be set unconditionally. from CMakeLists.txt: if(CRYPTO_VERSION VERSION_GREATER_EQUAL 3.0) add_definitions(-DOPENSSL_API_COMPAT=0x10100000L) endif() PR: 273909 --- security/libfido2/Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile index d80bbc263fca..3e2c3597dd39 100644 --- a/security/libfido2/Makefile +++ b/security/libfido2/Makefile @@ -15,6 +15,7 @@ LIB_DEPENDS= libcbor.so:devel/libcbor USES= cmake compiler:c11 pathfix pkgconfig ssl +CFLAGS+= -DOPENSSL_API_COMPAT=0x10101000L CMAKE_OFF= FUZZ LIBFUZZER NFC_LINUX USE_HIDAPI USE_WINHELLO CMAKE_ON= BUILD_EXAMPLES BUILD_MANPAGES BUILD_SHARED_LIBS BUILD_STATIC_LIBS BUILD_TOOLS @@ -29,8 +30,4 @@ OPTIONS_DEFINE= DOCS EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl .endif -.if ${SSL_DEFAULT} == openssl -CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L -.endif - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310161649.39GGnCbj011985>