Date: Mon, 13 Jul 2020 16:06:08 -0700 From: Craig Leres <leres@freebsd.org> To: Hajimu UMEMOTO <ume@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r541879 - head/security/yubico-piv-tool/files Message-ID: <6184c89e-8657-62af-7e33-0ed86ed9b417@freebsd.org> In-Reply-To: <202007101840.06AIe4gl053850@repo.freebsd.org> References: <202007101840.06AIe4gl053850@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------4ACD07048F0FB0B16F90CDCA Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit 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 --------------4ACD07048F0FB0B16F90CDCA Content-Type: text/plain; charset=UTF-8; name="patch.txt" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="patch.txt" SW5kZXg6IHNlY3VyaXR5L3l1Ymljby1waXYtdG9vbC9NYWtlZmlsZQo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBzZWN1cml0eS95dWJpY28tcGl2LXRvb2wvTWFrZWZpbGUJKHJldmlzaW9uIDU0MjEy NCkKKysrIHNlY3VyaXR5L3l1Ymljby1waXYtdG9vbC9NYWtlZmlsZQkod29ya2luZyBjb3B5 KQpAQCAtNDEsNiArNDEsMTAgQEAKIAogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4KIAor LmlmICR7U1NMX0RFRkFVTFR9ICE9IGJhc2UKK0VYVFJBX1BBVENIRVM9CSR7UEFUQ0hESVJ9 L2V4dHJhLXBhdGNoLUNNYWtlTGlzdHMudHh0CisuZW5kaWYKKwogLmlmICR7Q0hPU0VOX0NP TVBJTEVSX1RZUEV9ID09IGdjYwogcG9zdC1wYXRjaDoKIAlAJHtSRUlOUExBQ0VfQ01EfSAt ZSAnLyNwcmFnbWEgR0NDIGRpYWdub3N0aWMvZCcgXApJbmRleDogc2VjdXJpdHkveXViaWNv LXBpdi10b29sL2ZpbGVzL2V4dHJhLXBhdGNoLUNNYWtlTGlzdHMudHh0Cj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KSW5kZXg6IHNlY3VyaXR5L3l1Ymljby1waXYtdG9vbC9maWxlcy9wYXRjaC1DTWFrZUxp c3RzLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzZWN1cml0eS95dWJpY28tcGl2LXRvb2wvZmls ZXMvcGF0Y2gtQ01ha2VMaXN0cy50eHQJKHJldmlzaW9uIDU0MjEyNCkKKysrIHNlY3VyaXR5 L3l1Ymljby1waXYtdG9vbC9maWxlcy9wYXRjaC1DTWFrZUxpc3RzLnR4dAkobm9uZXhpc3Rl bnQpCkBAIC0xLDE1ICswLDAgQEAKLS0tLSBDTWFrZUxpc3RzLnR4dC5vcmlnCTIwMjAtMDct MTAgMTM6NDU6MTAgVVRDCi0rKysgQ01ha2VMaXN0cy50eHQKLUBAIC0xMjEsOSArMTIxLDkg QEAgaWYoQ01BS0VfQ09NUElMRVJfSVNfR05VQ0MpCi0gICAgIHNldChDTUFLRV9DX0ZMQUdT ICIke0NNQUtFX0NfRkxBR1N9IC1Xbm8tdW51c2VkLXJlc3VsdCIpCi0gZW5kaWYoKQotIAot LWluY2x1ZGUoJHtDTUFLRV9TT1VSQ0VfRElSfS9jbWFrZS9vcGVuc3NsLmNtYWtlKQotLWZp bmRfbGliY3J5cHRvKCkKLS1pbmNsdWRlX2RpcmVjdG9yaWVzKCR7TElCQ1JZUFRPX0lOQ0xV REVfRElSU30pCi0rIyBpbmNsdWRlKCR7Q01BS0VfU09VUkNFX0RJUn0vY21ha2Uvb3BlbnNz bC5jbWFrZSkKLSsjIGZpbmRfbGliY3J5cHRvKCkKLSsjIGluY2x1ZGVfZGlyZWN0b3JpZXMo JHtMSUJDUllQVE9fSU5DTFVERV9ESVJTfSkKLSAKLSBlbmFibGVfdGVzdGluZygpCi0gZmlu ZF9wYWNrYWdlKGNvZGVjb3YpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiBzZWN1cml0eS95dWJp Y28tcGl2LXRvb2wvZmlsZXMvcGF0Y2gtQ01ha2VMaXN0cy50eHQKX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpE ZWxldGVkOiBmYnNkOm5va2V5d29yZHMKIyMgLTEgKzAsMCAjIwoteWVzClwgTm8gbmV3bGlu ZSBhdCBlbmQgb2YgcHJvcGVydHkKRGVsZXRlZDogc3ZuOmVvbC1zdHlsZQojIyAtMSArMCww ICMjCi1uYXRpdmUKXCBObyBuZXdsaW5lIGF0IGVuZCBvZiBwcm9wZXJ0eQpEZWxldGVkOiBz dm46bWltZS10eXBlCiMjIC0xICswLDAgIyMKLXRleHQvcGxhaW4KXCBObyBuZXdsaW5lIGF0 IGVuZCBvZiBwcm9wZXJ0eQo= --------------4ACD07048F0FB0B16F90CDCA--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6184c89e-8657-62af-7e33-0ed86ed9b417>