Skip to content

Commit 39a7ce8

Browse files
committed
don't try to build exteral/googleapis as shared on win
1 parent b62462d commit 39a7ce8

File tree

4 files changed

+28
-2
lines changed

4 files changed

+28
-2
lines changed

recipe/meta.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ source:
1818
- patches/0001-disable-libraries.patch # [libprotobuf == "3.21"]
1919
# backport https://github.com/googleapis/google-cloud-cpp/pull/11782
2020
- patches/0002-fix-better-support-for-cross-compilation-11782.patch
21+
# don't try to build the protobuf-heavy googleapis as shared on win
22+
- patches/0003-do-not-try-to-build-external-googleapis-as-shared.patch # [win]
2123

2224
build:
2325
number: 1

recipe/patches/0001-disable-libraries.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From f014c88e7ea57ec2907edf26752264566ef7fa0a Mon Sep 17 00:00:00 2001
22
From: Carlos O'Ryan <[email protected]>
33
Date: Tue, 7 Feb 2023 01:35:26 +0000
4-
Subject: [PATCH 1/2] disable libraries
4+
Subject: [PATCH 1/3] disable libraries
55

66
---
77
cmake/GoogleCloudCppFeatures.cmake | 6 +++---

recipe/patches/0002-fix-better-support-for-cross-compilation-11782.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
From ddfa37bdafcf5ae551157676f5086518f720417d Mon Sep 17 00:00:00 2001
22
From: Carlos O'Ryan <[email protected]>
33
Date: Tue, 6 Jun 2023 11:30:17 -0400
4-
Subject: [PATCH 2/2] fix: better support for cross-compilation (#11782)
4+
Subject: [PATCH 2/3] fix: better support for cross-compilation (#11782)
55

66
Allow overrides for the `protobuf::protoc` and `gRPC::grpc_cpp_plugin`
77
targets. On cross-compilation builds the targets point to the binaries
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From d9f5e22ce65f427a42d5988fa7227d2dc257b7db Mon Sep 17 00:00:00 2001
2+
From: "H. Vetinari" <[email protected]>
3+
Date: Wed, 31 Aug 2022 19:00:34 +0200
4+
Subject: [PATCH 3/3] do not try to build external/googleapis as shared
5+
6+
---
7+
CMakeLists.txt | 3 +++
8+
1 file changed, 3 insertions(+)
9+
10+
diff --git a/CMakeLists.txt b/CMakeLists.txt
11+
index 028802691d..59fb481451 100644
12+
--- a/CMakeLists.txt
13+
+++ b/CMakeLists.txt
14+
@@ -207,7 +207,10 @@ host environment.
15+
"find_dependency(Protobuf)")
16+
find_package(Protobuf REQUIRED)
17+
endif ()
18+
+ # do not try to build googleapis shared on windows
19+
+ set(BUILD_SHARED_LIBS OFF)
20+
add_subdirectory(external/googleapis)
21+
+ set(BUILD_SHARED_LIBS ON)
22+
endif ()
23+
24+
# Enable testing in this directory so we can do a top-level `make test`. This

0 commit comments

Comments
 (0)