Date: Wed, 30 Jun 2021 20:45:41 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: 914f790c120f - main - devel/grpc: Fix pkgconfig file Message-ID: <202106302045.15UKjfaX053599@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=914f790c120f9de0ba7ef37aae9a4fd3bed475ee commit 914f790c120f9de0ba7ef37aae9a4fd3bed475ee Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2021-06-30 20:35:19 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2021-06-30 20:43:33 +0000 devel/grpc: Fix pkgconfig file - Bump PORTREVISION for package change --- devel/grpc/Makefile | 10 +++++++++- devel/grpc/files/extra-patch-CMakeLists.txt | 13 +++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile index 0aad80558e16..de0629308967 100644 --- a/devel/grpc/Makefile +++ b/devel/grpc/Makefile @@ -3,6 +3,7 @@ PORTNAME= grpc PORTVERSION= 1.38.1 DISTVERSIONPREFIX= v +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel @@ -38,4 +39,11 @@ USE_LDCONFIG= yes PLIST_SUB= SHLIB_MAJOR=${PORTVERSION:R} \ SHLIB_MINOR=${PORTVERSION:E} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +# Remove openssl from grpc.pc because we do not ship openssl.pc in base system +.if ${SSL_DEFAULT} == base +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-CMakeLists.txt +.endif + +.include <bsd.port.post.mk> diff --git a/devel/grpc/files/extra-patch-CMakeLists.txt b/devel/grpc/files/extra-patch-CMakeLists.txt new file mode 100644 index 000000000000..07020b8e727b --- /dev/null +++ b/devel/grpc/files/extra-patch-CMakeLists.txt @@ -0,0 +1,13 @@ +Remove openssl from grpc.pc because we do not ship openssl.pc in base system + +--- CMakeLists.txt.orig 2021-06-19 00:53:16 UTC ++++ CMakeLists.txt +@@ -15696,7 +15696,7 @@ generate_pkgconfig( + "gRPC" + "high performance general RPC framework" + "${gRPC_CORE_VERSION}" +- "gpr openssl absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time" ++ "gpr absl_base absl_bind_front absl_flat_hash_map absl_inlined_vector absl_memory absl_optional absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time" + "-lgrpc -laddress_sorting -lre2 -lupb -lcares -lz" + "" + "grpc.pc")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106302045.15UKjfaX053599>