[postgis-tickets] [SCM] PostGIS branch master updated. 3.2.0-606-g62e5bf117

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, master has been updated
       via  62e5bf1177595eee23190fc4be4ad6011778f0c7 (commit)
      from  b6fadaf4ece60d5143f2fe88bb66e26986be4687 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 62e5bf1177595eee23190fc4be4ad6011778f0c7
Author: sergei sh <managerzf168 at gmail.com>
Date:   Thu Feb 24 02:06:29 2022 +0300

    Allowing archiver program and flags options in ./configure

diff --git a/configure.ac b/configure.ac
index 2603299e7..586d5da3a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,8 @@ AC_CONFIG_MACRO_DIR([macros])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_PROG_INSTALL
 
+# Set default AR_FLAGS before libtool does
+: ${AR_FLAGS=rs}
 
 dnl Invoke libtool: we do this as it is the easiest way to find the PIC
 dnl flags required to build liblwgeom
@@ -62,7 +64,7 @@ AC_SUBST([SQLPP])
 dnl
 dnl Silence warning: ar: 'u' modifier ignored since 'D' is the default
 dnl
-AC_SUBST(AR_FLAGS, [cr])
+AC_ARG_VAR(AR_FLAGS, [Archiver flags])
 
 dnl
 dnl Define PIC flags in PICFLAGS (note: this variable is set as part of libtool initialisation above)
@@ -1758,6 +1760,7 @@ fi
 AC_MSG_RESULT([  CPPFLAGS:             $CPPFLAGS])
 AC_MSG_RESULT([  LDFLAGS:              $LDFLAGS])
 AC_MSG_RESULT([  SQL preprocessor:     ${SQLPP}])
+AC_MSG_RESULT([  Archiver:             $AR $AR_FLAGS])
 AC_MSG_RESULT()
 AC_MSG_RESULT([ -------------- Additional Info ------------- ])
 if test "x$LIBINCLUDEMINORVERSION" = "xyes"; then
diff --git a/deps/flatgeobuf/Makefile.in b/deps/flatgeobuf/Makefile.in
index 17e35b556..2510cad89 100644
--- a/deps/flatgeobuf/Makefile.in
+++ b/deps/flatgeobuf/Makefile.in
@@ -50,7 +50,7 @@ FLATGEOBUF_HEADERS = \
 all: @FLATGEOBUF_LIB@
 
 @FLATGEOBUF_LIB@: $(FLATGEOBUF_OBJS)
-	ar rs @FLATGEOBUF_LIB@ $(FLATGEOBUF_OBJS)
+	@AR@ @AR_FLAGS@ @FLATGEOBUF_LIB@ $(FLATGEOBUF_OBJS)
 
 $(FLATGEOBUF_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(FLATGEOBUF_HEADERS)
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
diff --git a/deps/wagyu/Makefile.in b/deps/wagyu/Makefile.in
index 98b5cb76d..348b4bedd 100644
--- a/deps/wagyu/Makefile.in
+++ b/deps/wagyu/Makefile.in
@@ -84,7 +84,7 @@ WAGYU_HEADERS = \
 all: @WAGYU_LIB@
 
 @WAGYU_LIB@: $(WAGYU_OBJS)
-	ar rs @WAGYU_LIB@ $(WAGYU_OBJS)
+	@AR@ @AR_FLAGS@ @WAGYU_LIB@ $(WAGYU_OBJS)
 
 $(WAGYU_OBJS): %.o: %.cpp ../../liblwgeom/liblwgeom.h $(WAGYU_HEADERS)
 	$(CXX) $(CXXFLAGS) -c -o $@ $<
diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index fb66c6895..b99b02c89 100644
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -43,7 +43,7 @@ all: libpgcommon.a
 install uninstall:
 
 libpgcommon.a: $(SA_OBJS) $(SA_HEADERS)
-	ar rs libpgcommon.a $(SA_OBJS)
+	@AR@ @AR_FLAGS@ libpgcommon.a $(SA_OBJS)
 
 maintainer-clean: clean
 
diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
index 385ff9b26..9680ef9a0 100644
--- a/raster/rt_core/Makefile.in
+++ b/raster/rt_core/Makefile.in
@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
 builddir = @builddir@
 top_builddir = @top_builddir@
 
-AR = ar rs
+AR = @AR@ @AR_FLAGS@
 
 CC = @CC@
 LIBLWGEOM_LDFLAGS = $(top_builddir)/liblwgeom/.libs/liblwgeom.a

-----------------------------------------------------------------------

Summary of changes:
 configure.ac                | 5 ++++-
 deps/flatgeobuf/Makefile.in | 2 +-
 deps/wagyu/Makefile.in      | 2 +-
 libpgcommon/Makefile.in     | 2 +-
 raster/rt_core/Makefile.in  | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS