43 lines
1.7 KiB
Diff
43 lines
1.7 KiB
Diff
|
From 8b80c4bd848ff3d71b998dc8a4bd42627ed72581 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
Date: Sat, 17 Apr 2021 11:58:19 +0200
|
||
|
|
Subject: [PATCH] configure.ac: fix cross-compilation with protobuf-c
|
||
|
|
|
||
|
|
Try to retrieve the version from pkg-config to avoid the following
|
||
|
|
error:
|
||
|
|
|
||
|
|
checking protobuf-c version... configure: error: in `/home/fabrice/buildroot/output/build/postgis-3.1.1':
|
||
|
|
configure: error: cannot run test program while cross compiling
|
||
|
|
|
||
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||
|
|
[Retrieved from:
|
||
|
|
https://github.com/postgis/postgis/commit/8b80c4bd848ff3d71b998dc8a4bd42627ed72581]
|
||
|
|
---
|
||
|
|
configure.ac | 6 +++++-
|
||
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 48ba070a40..df75fe6601 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -1004,6 +1004,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
|
||
|
|
PKG_CHECK_MODULES([PROTOBUFC], [libprotobuf-c >= 1.1.0], [
|
||
|
|
PROTOBUF_CPPFLAGS="$PROTOBUFC_CFLAGS";
|
||
|
|
PROTOBUF_LDFLAGS="$PROTOBUFC_LIBS";
|
||
|
|
+ PROTOC_VERSION=`$PKG_CONFIG libprotobuf-c --modversion | sed 's/\([[0-9]]\).*\([[0-9]]\).*\([[0-9]]\)/\100\200\3/'`
|
||
|
|
], [
|
||
|
|
AC_MSG_RESULT([libprotobuf-c not found in pkg-config])
|
||
|
|
])
|
||
|
|
@@ -1054,7 +1055,10 @@ if test "$CHECK_PROTOBUF" != "no"; then
|
||
|
|
[])
|
||
|
|
|
||
|
|
AC_MSG_CHECKING([protobuf-c version])
|
||
|
|
- AC_PROTOBUFC_VERSION([PROTOC_VERSION])
|
||
|
|
+ dnl Return the protobuf-c version number if not detected by pkg-config
|
||
|
|
+ if test "x$PROTOC_VERSION" = "x"; then
|
||
|
|
+ AC_PROTOBUFC_VERSION([PROTOC_VERSION])
|
||
|
|
+ fi
|
||
|
|
if test ! "$PROTOC_VERSION" -ge 1001000; then
|
||
|
|
AC_MSG_ERROR("Old protobuf-c release found but 1.1.0 is required. You can disable MVT and Geobuf support using --without-protobuf")
|
||
|
|
fi
|