[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-166-gf72f7e431
git at osgeo.org
git at osgeo.org
Sun Oct 2 13:15:43 PDT 2022
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 f72f7e431c195a71f262db0f728e4c21a4295aec (commit)
via b2c4c9e76909200dbce897be10001db541bca91d (commit)
via 27b9a8f0d5a7398dad85f7110850cfe32a9b9c15 (commit)
via 93b98069713d46282cd23c3bedec6fc82242a513 (commit)
via 98070faad220e12fcaed9a583a70a37c510b7c6b (commit)
from b9439d2d0d7cabfad1fbed3c71c720be13b89133 (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 f72f7e431c195a71f262db0f728e4c21a4295aec
Merge: b2c4c9e76 93b980697
Author: Regina Obe <lr at pcorp.us>
Date: Sun Oct 2 15:48:37 2022 -0400
Merge remote-tracking branch 'tpetazzoni/no-force-static-link'
References #5255 for PostGIS 3.4.0dev
References GH702
commit b2c4c9e76909200dbce897be10001db541bca91d
Merge: 27b9a8f0d 98070faad
Author: Regina Obe <lr at pcorp.us>
Date: Sun Oct 2 15:45:10 2022 -0400
Merge remote-tracking branch 'fidomax/patch-4'
References #5255 for PostGIS 3.4.0dev
References GH598
commit 27b9a8f0d5a7398dad85f7110850cfe32a9b9c15
Author: Regina Obe <lr at pcorp.us>
Date: Sun Oct 2 15:42:28 2022 -0400
Take out upgrade for GHA. Need to allow sudo on docker before we can. References #5253
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 79b639b59..2e2080c95 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -28,7 +28,7 @@ jobs:
- { tag: pg13-clang-geos39-gdal31-proj71, mode: usan_clang }
# Run tests with different dependency combinations
# - { tag: latest, mode: upgrade }
- - { tag: pg13-geos38-gdal31-proj71, mode: upgrade }
+ - { tag: pg13-geos38-gdal31-proj71, mode: tests }
- { tag: pg12-geos37-gdal30-proj611, mode: tests }
runs-on: ubuntu-latest
commit 93b98069713d46282cd23c3bedec6fc82242a513
Author: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
Date: Wed Jul 27 15:12:40 2022 +0200
raster/loader/Makefile.in: do not force static linking
This is similar to commit
https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b,
but applied to raster/loader. It ensures that if only shared variants
of the libraries are available, the link still works. If you force
-static and only shared variants of some of the libraries are
available, the link fails with "d: attempted static link of dynamic
object XYZ".
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index b5d2e6709..5fc6b6038 100644
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -38,7 +38,7 @@ RASTER2PGSQL=raster2pgsql at EXESUFFIX@
# PostgreSQL executable directory
PGSQL_BINDIR=@PGSQL_BINDIR@
-LIBLWGEOM_LDFLAGS = -static $(top_builddir)/liblwgeom/liblwgeom.la
+LIBLWGEOM_LDFLAGS = $(top_builddir)/liblwgeom/liblwgeom.la
LIBLWGEOM_CFLAGS = -I$(top_builddir)/liblwgeom -I$(top_srcdir)/liblwgeom
LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
commit 98070faad220e12fcaed9a583a70a37c510b7c6b
Author: fidomax <adobegitler at gmail.com>
Date: Tue Jan 26 09:49:19 2021 +0300
Disable forced static linking of liblwgeom
In case of shared libs build fails:
ld: cannot find -lgeos_c
ld: attempted static link of dynamic object `/usr/lib/libproj.so'
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 9aebfe07f..9a0c90d3a 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -44,7 +44,7 @@ ICONV_CFLAGS=@ICONV_CFLAGS@
# liblwgeom
LIBLWGEOM=../liblwgeom/liblwgeom.la
-LDFLAGS += -static $(LIBLWGEOM)
+LDFLAGS += $(LIBLWGEOM)
# GTK includes and libraries
GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
-----------------------------------------------------------------------
Summary of changes:
.github/workflows/ci.yml | 2 +-
loader/Makefile.in | 2 +-
raster/loader/Makefile.in | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
PostGIS
More information about the postgis-tickets
mailing list