generated from gaoyang3513/SDK_RK3288
[Mod] First commit
This commit is contained in:
@ -0,0 +1,31 @@
|
||||
From 845c18c1288b7a96592901baadb198f96dd71c46 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
|
||||
|
||||
In case of shared libs build fails:
|
||||
ld: cannot find -lgeos_c
|
||||
ld: attempted static link of dynamic object `/usr/lib/libproj.so'
|
||||
|
||||
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
|
||||
Fetch from: https://github.com/postgis/postgis/commit/98070faad220e12fcaed9a583a70a37c510b7c6b.patch
|
||||
---
|
||||
loader/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
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@
|
||||
--
|
||||
2.30.0
|
||||
|
||||
@ -0,0 +1,35 @@
|
||||
From 29c33c483e22a4445d870739187d128df0f11f60 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
|
||||
|
||||
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@bootlin.com>
|
||||
Upstream: https://github.com/postgis/postgis/pull/702
|
||||
---
|
||||
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
|
||||
--- a/raster/loader/Makefile.in
|
||||
+++ b/raster/loader/Makefile.in
|
||||
@@ -36,7 +36,7 @@ PGSQL_BINDIR=@PGSQL_BINDIR@
|
||||
|
||||
RT_CORE=../rt_core
|
||||
|
||||
-LIBLWGEOM_LDFLAGS= -static ../../liblwgeom/liblwgeom.la
|
||||
+LIBLWGEOM_LDFLAGS= ../../liblwgeom/liblwgeom.la
|
||||
LIBLWGEOM_CFLAGS=-I../../liblwgeom
|
||||
LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
|
||||
LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
|
||||
--
|
||||
2.37.1
|
||||
|
||||
24
package/postgis/Config.in
Normal file
24
package/postgis/Config.in
Normal file
@ -0,0 +1,24 @@
|
||||
config BR2_PACKAGE_POSTGIS
|
||||
bool "postgis"
|
||||
depends on BR2_PACKAGE_POSTGRESQL_FULL
|
||||
depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj
|
||||
depends on BR2_USE_WCHAR # libgeos, proj
|
||||
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos
|
||||
select BR2_PACKAGE_LIBGEOS
|
||||
select BR2_PACKAGE_PROJ
|
||||
select BR2_PACKAGE_LIBXML2
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
PostGIS is a spatial database extender for PostgreSQL
|
||||
object-relational database. It adds support for
|
||||
geographic objects allowing location queries
|
||||
to be run in SQL.
|
||||
|
||||
https://postgis.net/
|
||||
|
||||
comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.7, not binutils bug 27597"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
|
||||
!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
|
||||
BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
|
||||
3
package/postgis/postgis.hash
Normal file
3
package/postgis/postgis.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 18cf3d013f45b1aa8ed59d78bc707e9e125e250d8f0615396ae9bfe3dd7c3d7c postgis-3.2.2.tar.gz
|
||||
sha256 55b69f22e1752830dd565852dc7ff242daf289dbd3a6bfede5db43f90d2e28c9 LICENSE.TXT
|
||||
49
package/postgis/postgis.mk
Normal file
49
package/postgis/postgis.mk
Normal file
@ -0,0 +1,49 @@
|
||||
################################################################################
|
||||
#
|
||||
# postgis
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POSTGIS_VERSION = 3.2.2
|
||||
POSTGIS_SITE = https://download.osgeo.org/postgis/source
|
||||
# parallel build issues
|
||||
POSTGIS_MAKE = $(MAKE1)
|
||||
POSTGIS_LICENSE = GPL-2.0+ (PostGIS), BSD-2-Clause, MIT, Apache-2.0, ISC, BSL-1.0, CC-BY-SA-3.0
|
||||
POSTGIS_LICENSE_FILES = LICENSE.TXT
|
||||
POSTGIS_CPE_ID_VENDOR = postgis
|
||||
# configure.ac is patched so need to run autoreconf
|
||||
POSTGIS_AUTORECONF = YES
|
||||
|
||||
POSTGIS_DEPENDENCIES = postgresql libgeos proj libxml2
|
||||
|
||||
POSTGIS_CONF_OPTS += \
|
||||
--with-pgconfig=$(STAGING_DIR)/usr/bin/pg_config \
|
||||
--with-geosconfig=$(STAGING_DIR)/usr/bin/geos-config \
|
||||
--with-xml2config=$(STAGING_DIR)/usr/bin/xml2-config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_JSON_C),y)
|
||||
POSTGIS_DEPENDENCIES += json-c
|
||||
POSTGIS_CONF_OPTS += --with-json
|
||||
else
|
||||
POSTGIS_CONF_OPTS += --without-json
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDAL),y)
|
||||
POSTGIS_DEPENDENCIES += gdal
|
||||
POSTGIS_CONF_OPTS += --with-raster --with-gdalconfig=$(STAGING_DIR)/usr/bin/gdal-config
|
||||
else
|
||||
POSTGIS_CONF_OPTS += --without-raster
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PCRE),y)
|
||||
POSTGIS_DEPENDENCIES += pcre
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PROTOBUF_C),y)
|
||||
POSTGIS_DEPENDENCIES += protobuf-c
|
||||
POSTGIS_CONF_OPTS += --with-protobuf
|
||||
else
|
||||
POSTGIS_CONF_OPTS += --without-protobuf
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user