@@ -1,4 +1,4 @@
-From 845c18c1288b7a96592901baadb198f96dd71c46 Mon Sep 17 00:00:00 2001
+From 98070faad220e12fcaed9a583a70a37c510b7c6b Mon Sep 17 00:00:00 2001
From: fidomax <adobegitler@gmail.com>
Date: Tue, 26 Jan 2021 09:49:19 +0300
Subject: [PATCH] Disable forced static linking of liblwgeom
@@ -27,5 +27,5 @@ index 9aebfe07f..9a0c90d3a 100644
# GTK includes and libraries
GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
--
-2.30.0
+2.34.1
@@ -1,4 +1,4 @@
-From 29c33c483e22a4445d870739187d128df0f11f60 Mon Sep 17 00:00:00 2001
+From 93b98069713d46282cd23c3bedec6fc82242a513 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: Wed, 27 Jul 2022 15:12:40 +0200
Subject: [PATCH] raster/loader/Makefile.in: do not force static linking
@@ -12,24 +12,25 @@ available, the link fails with "d: attempted static link of dynamic
object XYZ".
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-Upstream: https://github.com/postgis/postgis/pull/702
+Upstream: https://github.com/postgis/postgis/commit/93b98069713d46282cd23c3bedec6fc82242a513.patch
+Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
---
raster/loader/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
-index 3df47a96f..d0a408333 100644
+index b5d2e6709..5fc6b6038 100644
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
-@@ -36,7 +36,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@
+@@ -38,7 +38,7 @@ RASTER2PGSQL=raster2pgsql@EXESUFFIX@
+ # PostgreSQL executable directory
+ PGSQL_BINDIR=@PGSQL_BINDIR@
- RT_CORE=../rt_core
-
--LIBLWGEOM_LDFLAGS= -static ../../liblwgeom/liblwgeom.la
-+LIBLWGEOM_LDFLAGS= ../../liblwgeom/liblwgeom.la
- LIBLWGEOM_CFLAGS=-I../../liblwgeom
+-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@
--
-2.37.1
+2.34.1
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 18cf3d013f45b1aa8ed59d78bc707e9e125e250d8f0615396ae9bfe3dd7c3d7c postgis-3.2.2.tar.gz
+sha256 91be800a72d748c5a3a4a00d82ac1de42023e29da61ece6ebf9c77fe228fcb1a postgis-3.3.1.tar.gz
sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT
@@ -4,7 +4,7 @@
#
################################################################################
-POSTGIS_VERSION = 3.2.2
+POSTGIS_VERSION = 3.3.1
POSTGIS_SITE = https://download.osgeo.org/postgis/source
# parallel build issues
POSTGIS_MAKE = $(MAKE1)
Release-notes: https://git.osgeo.org/gitea/postgis/postgis/src/tag/3.3.1/NEWS Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru> --- Changes in v2: * All the patches are merged into upstream. --- ...e-forced-static-linking-of-liblwgeom.patch | 4 ++-- ...kefile.in-do-not-force-static-linkin.patch | 21 ++++++++++--------- package/postgis/postgis.hash | 2 +- package/postgis/postgis.mk | 2 +- 4 files changed, 15 insertions(+), 14 deletions(-)