CVS commit: pkgsrc/net/grpc

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun 21 10:18:19 UTC 2024

Modified Files:
        pkgsrc/net/grpc: Makefile distinfo
Added Files:
        pkgsrc/net/grpc/patches: patch-cmake_protobuf.cmake

Log Message:
grpc: Fix path to protobuf includes.

Somewhere deep in the bowels of cmake this variable wasn't being set correctly.
Fixes the build on at least NetBSD and SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 pkgsrc/net/grpc/Makefile
cvs rdiff -u -r1.86 -r1.87 pkgsrc/net/grpc/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/grpc/patches/patch-cmake_protobuf.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/grpc/Makefile
diff -u pkgsrc/net/grpc/Makefile:1.91 pkgsrc/net/grpc/Makefile:1.92
--- pkgsrc/net/grpc/Makefile:1.91       Sat Jun 15 18:54:34 2024
+++ pkgsrc/net/grpc/Makefile    Fri Jun 21 10:18:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2024/06/15 18:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.92 2024/06/21 10:18:19 jperkin Exp $
 
 DISTNAME=      grpc-1.64.2
 CATEGORIES=    net
@@ -25,6 +25,11 @@ CMAKE_ARGS+= -DgRPC_RE2_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_SSL_PROVIDER=package
 CMAKE_ARGS+=   -DgRPC_ZLIB_PROVIDER=package
 
+SUBST_CLASSES+=                vars
+SUBST_STAGE.vars=      pre-configure
+SUBST_FILES.vars=      cmake/protobuf.cmake
+SUBST_VARS.vars=       BUILDLINK_PREFIX.protobuf
+
 # This should be included in the distfile, but it's not,
 # so CMakeFile.txt will try to download it.
 CENSUS_VER=            0.3.0

Index: pkgsrc/net/grpc/distinfo
diff -u pkgsrc/net/grpc/distinfo:1.86 pkgsrc/net/grpc/distinfo:1.87
--- pkgsrc/net/grpc/distinfo:1.86       Sat Jun 15 18:54:34 2024
+++ pkgsrc/net/grpc/distinfo    Fri Jun 21 10:18:19 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.86 2024/06/15 18:54:34 wiz Exp $
+$NetBSD: distinfo,v 1.87 2024/06/21 10:18:19 jperkin Exp $
 
 BLAKE2s (grpc-1.64.2.tar.gz) = b71c56edd5576f006406eaefffac256cdebc14a3256d5fabd7f4b57464f38d5d
 SHA512 (grpc-1.64.2.tar.gz) = f9e8976022a52ee57d095fbd02f7e88167e3ddf78f8aef181a5dce4c8f09b2193e0f89689e415ff438b7a3480f06450ea334b8df9359fcf8b05ce4b2f7531b85
@@ -7,6 +7,7 @@ BLAKE2s (opencensus-proto-0.3.0.tar.gz) 
 SHA512 (opencensus-proto-0.3.0.tar.gz) = 39231a495dfdccfc8267d1e6af2ac624feea611a8691c10ec570de2194b352e4a9c3b0ce1606414fb98e5d77c66873bed4a9e56512efa12b267b8a91e0c5851e
 Size (opencensus-proto-0.3.0.tar.gz) = 163404 bytes
 SHA1 (patch-CMakeLists.txt) = 433295332f5fdc5ae5033714335161eb61afc06a
+SHA1 (patch-cmake_protobuf.cmake) = 7aa6563b03dce5a07115f98c7d9bef62ef24e0f4
 SHA1 (patch-include_grpc_event__engine_port.h) = ee0937d5ec59d2f0a462a64145fc63ef68564c17
 SHA1 (patch-src_core_lib_event__engine_cf__engine_cfstream__endpoint.h) = 75c50a6e275de0e47feb0cfa0f0976078025caba
 SHA1 (patch-src_core_lib_iomgr_port.h) = 81e474c608595b5b2defdd04e8c52a63485e7d06

Added files:

Index: pkgsrc/net/grpc/patches/patch-cmake_protobuf.cmake
diff -u /dev/null pkgsrc/net/grpc/patches/patch-cmake_protobuf.cmake:1.1
--- /dev/null   Fri Jun 21 10:18:19 2024
+++ pkgsrc/net/grpc/patches/patch-cmake_protobuf.cmake  Fri Jun 21 10:18:19 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-cmake_protobuf.cmake,v 1.1 2024/06/21 10:18:19 jperkin Exp $
+
+Fix path to protobuf includes.
+
+--- cmake/protobuf.cmake.orig  2024-06-21 09:51:22.590836989 +0000
++++ cmake/protobuf.cmake
+@@ -66,7 +66,7 @@ elseif(gRPC_PROTOBUF_PROVIDER STREQUAL "
+     if(TARGET protobuf::libprotoc)
+       set(_gRPC_PROTOBUF_PROTOC_LIBRARIES protobuf::libprotoc)
+       # extract the include dir from target's properties
+-      get_target_property(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR protobuf::libprotoc INTERFACE_INCLUDE_DIRECTORIES)
++      set(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR "@BUILDLINK_PREFIX.protobuf@/include")
+     else()
+       set(_gRPC_PROTOBUF_PROTOC_LIBRARIES ${PROTOBUF_PROTOC_LIBRARIES})
+       set(_gRPC_PROTOBUF_WELLKNOWN_INCLUDE_DIR ${PROTOBUF_INCLUDE_DIRS})