Date: Mon, 31 Jul 2023 20:20:50 +0200 From: Daniel Engberg <diizzy@FreeBSD.org> To: Po-Chuan Hsieh <sunpoet@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: c25f0c013e88 - main - databases/libmemcached: Skip libcrypto.pc when using SSL from base system Message-ID: <fd79ae5502e288a54ead898d61f17e28@FreeBSD.org> In-Reply-To: <202307091033.369AXqZ7055562@gitrepo.freebsd.org> References: <202307091033.369AXqZ7055562@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2023-07-09 12:33, Po-Chuan Hsieh wrote: > The branch main has been updated by sunpoet: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=c25f0c013e88d84c620b2bb8c56158e9ca7f8bef > > commit c25f0c013e88d84c620b2bb8c56158e9ca7f8bef > Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > AuthorDate: 2023-07-09 10:17:04 +0000 > Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> > CommitDate: 2023-07-09 10:17:04 +0000 > > databases/libmemcached: Skip libcrypto.pc when using SSL from base > system > > - Bump PORTREVISION for package change > --- > databases/libmemcached/Makefile | 10 +++++++++- > databases/libmemcached/files/extra-patch-openssl | 11 +++++++++++ > 2 files changed, 20 insertions(+), 1 deletion(-) > > diff --git a/databases/libmemcached/Makefile > b/databases/libmemcached/Makefile > index e044f28499fd..71f031d3014f 100644 > --- a/databases/libmemcached/Makefile > +++ b/databases/libmemcached/Makefile > @@ -1,5 +1,6 @@ > PORTNAME= libmemcached > PORTVERSION= 1.1.4 > +PORTREVISION= 1 > CATEGORIES= databases > > MAINTAINER= sunpoet@FreeBSD.org > @@ -44,4 +45,11 @@ MURMUR_CMAKE_BOOL= ENABLE_HASH_MURMUR > SASL_CMAKE_BOOL= ENABLE_SASL > SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 > > -.include <bsd.port.mk> > +.include <bsd.port.pre.mk> > + > +# Skip libcrypto.pc while using OpenSSL from base system on older > FreeBSD versions which does not skip this file > +.if ${SSL_DEFAULT} == base && > !exists(/usr/libdata/pkgconfig/libcrypto.pc) > +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-openssl > +.endif > + > +.include <bsd.port.post.mk> > diff --git a/databases/libmemcached/files/extra-patch-openssl > b/databases/libmemcached/files/extra-patch-openssl > new file mode 100644 > index 000000000000..bf65fa7f4ece > --- /dev/null > +++ b/databases/libmemcached/files/extra-patch-openssl > @@ -0,0 +1,11 @@ > +--- src/libhashkit/CMakeLists.txt.orig 2023-03-06 08:47:30 UTC > ++++ src/libhashkit/CMakeLists.txt > +@@ -45,7 +45,7 @@ if(ENABLE_OPENSSL_CRYPTO) > + if(OPENSSL_CRYPTO_LIBRARY) > + target_compile_definitions(libhashkit > PRIVATE HAVE_OPENSSL_CRYPTO) > + target_link_libraries(libhashkit PUBLIC > OpenSSL::Crypto) > +- pkgconfig_export(REQUIRES_PRIVATE libcrypto) > ++ pkgconfig_export(REQUIRES_PRIVATE "") > + else() > + message(WARNING "Could not find > OpenSSL::Crypto") > + endif() Hi, Resending as I didn't get a reply last time, I few things I noticed compared to the PR I submitted about this port. -std=gnu++17 is set when unit tests are enabled so USES= compiler:c++11-lang is incorrect Is there a reason why default filenames aren't used for patches? Why are we using flex from base rather from ports? That openssl patch can be improved by doing something like this, https://cgit.freebsd.org/ports/tree/archivers/libarchive/Makefile#n124 Best regards, Daniel
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?fd79ae5502e288a54ead898d61f17e28>