Skip to contentSkip to conversation

package/proj: needs C++11

PATCH New Fabrice Fontaine 2 participants 4 messages Oct 8, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 package/proj: needs C++11

proj needs C++11 since version 5.2.0 and
https://github.com/OSGeo/PROJ/commit/29051766975d471c4eff9f7b3137752234cf1a4c

Fixes:
- http://autobuild.buildroot.org/results/af3451a37b5f6c81d4b19edfe84dbed09e1af0e9

---
 package/libgeotiff/Config.in | 7 +++++--
 package/proj/Config.in       | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)
package/libgeotiff/Config.in +5 -2
index 60ca4115d9..6ac8a51f7c 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_LIBGEOTIFF
 	bool "libgeotiff"
+	depends on BR2_INSTALL_LIBSTDCPP # proj
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj
 	depends on BR2_TOOLCHAIN_HAS_THREADS # proj
 	select BR2_PACKAGE_PROJ
 	select BR2_PACKAGE_TIFF
@@ -9,5 +11,6 @@ config BR2_PACKAGE_LIBGEOTIFF
 
 	  https://github.com/OSGeo/libgeotiff
 
-comment "libgeotiff needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS
package/proj/Config.in +5 -2
index 4880d3f2cd..ced386f465 100644
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_PROJ
 	bool "proj"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_SQLITE
 	help
@@ -11,5 +13,6 @@ config BR2_PACKAGE_PROJ
 
 	  http://proj4.org/
 
-comment "proj needs a toolchain w/ threads"
-	depends on !BR2_TOOLCHAIN_HAS_THREADS
+comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_HAS_THREADS
Signature · 1 line
2.23.0
#1 lore raw

PATCH 2/3 package/proj: needs host-pkgconf

pkg-config is used to retrieve sqlite dependency since version 6.0.0 and
https://github.com/OSGeo/PROJ/commit/322493235696097b94294f5f466a32f015a95626

---
 package/proj/proj.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/proj/proj.mk +1 -1
index 735e96bb5f..5a8ca3ded8 100644
@@ -9,7 +9,7 @@ PROJ_SITE = http://download.osgeo.org/proj
 PROJ_LICENSE = MIT
 PROJ_LICENSE_FILES = COPYING
 PROJ_INSTALL_STAGING = YES
-PROJ_DEPENDENCIES = sqlite
+PROJ_DEPENDENCIES = host-pkgconf sqlite
 
 PROJ_CFLAGS = $(TARGET_CFLAGS)
 
Signature · 1 line
2.23.0
#2 lore raw

PATCH 3/3 package/proj: needs host-sqlite

In reply to Fabrice Fontaine

proj needs sqlite binary to build proj.db since version 6.0.0 and
https://github.com/OSGeo/PROJ/commit/d928db15d53805d9b728b440079756081961c536

So add host-sqlite dependency

Fixes:
- http://autobuild.buildroot.org/results/668f30b404df4e7e0886e8382c6dcf2983947c01

---
 package/proj/proj.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/proj/proj.mk +1 -1
index 5a8ca3ded8..ca943141ce 100644
@@ -9,7 +9,7 @@ PROJ_SITE = http://download.osgeo.org/proj
 PROJ_LICENSE = MIT
 PROJ_LICENSE_FILES = COPYING
 PROJ_INSTALL_STAGING = YES
-PROJ_DEPENDENCIES = host-pkgconf sqlite
+PROJ_DEPENDENCIES = host-pkgconf host-sqlite sqlite
 
 PROJ_CFLAGS = $(TARGET_CFLAGS)
 
Signature · 1 line
2.23.0
#3 lore raw

PATCH 1/3 package/proj: needs C++11

In reply to Fabrice Fontaine
Quoted 11 lines · On Tue, 8 Oct 2019 19:04:31 +0200 Fabrice Fontaine…

proj needs C++11 since version 5.2.0 and
https://github.com/OSGeo/PROJ/commit/29051766975d471c4eff9f7b3137752234cf1a4c

Fixes:
- http://autobuild.buildroot.org/results/af3451a37b5f6c81d4b19edfe84dbed09e1af0e9

---
 package/libgeotiff/Config.in | 7 +++++--
 package/proj/Config.in       | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

Series applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com