This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 107d317ac Fix Ubuntu build break due to cmake upgrade (#952)
107d317ac is described below
commit 107d317acde1bd4fadf5ea9eea31d5a4a0a31f45
Author: Blake Bender <bben...@pivotal.io>
AuthorDate: Tue Apr 5 14:37:34 2022 -0700
Fix Ubuntu build break due to cmake upgrade (#952)
- New cmake version changes treatment of CMAKE_INSTALL_LIBDIR variable,
which now evaluates to different things for xerces build and main
client build. As a result, we build Xerces, then go looking to link
to it in the wrong place. It appears cmake has special code on Ubuntu
to use the wrong lib dir
iff CMAKE_INSTALL_PREFIX is set to /usr or /usr/local, so setting it to
something else seems the safest approach.
---
ci/base/base.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/ci/base/base.yml b/ci/base/base.yml
index 363350675..34386ea2a 100644
--- a/ci/base/base.yml
+++ b/ci/base/base.yml
@@ -96,9 +96,15 @@ builds:
- _: #@ template.replace(new_build("ubuntu-18.04"))
image_family: build-ubuntu-18-04
source_image_family: ubuntu-1804-lts
+ #@yaml/map-key-override
+ params:
+ CMAKE_CONFIGURE_FLAGS: "-DCMAKE_INSTALL_PREFIX=/home/build"
- _: #@ template.replace(new_build("ubuntu-20.04"))
image_family: build-ubuntu-20-04
source_image_family: ubuntu-2004-lts
+ #@yaml/map-key-override
+ params:
+ CMAKE_CONFIGURE_FLAGS: "-DCMAKE_INSTALL_PREFIX=/home/build"
configs: [ ]
