projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 138a291)
package/proj: needs C++11
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Tue, 8 Oct 2019 17:04:31 +0000 (19:04 +0200)
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>
Tue, 8 Oct 2019 20:38:19 +0000 (22:38 +0200)
proj needs C++11 since version 5.2.0 and
https://github.com/OSGeo/PROJ/commit/29051766975d471c4eff9f7b3137752234cf1a4c

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

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
package/libgeotiff/Config.in patch | blob | history
package/proj/Config.in patch | blob | history

diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in
index 60ca4115d9d471451214a4f658c31b90d035853f..6ac8a51f7ca2f08ef64dbe5fa72eca1cf84fc3c1 100644 (file)
--- a/package/libgeotiff/Config.in
+++ b/package/libgeotiff/Config.in
@@ -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
diff --git a/package/proj/Config.in b/package/proj/Config.in
index 4880d3f2cdb0db45a04d32615eaa7b263a1ac498..ced386f465a8f6aa5dcd86974f150acb5b5f9fd7 100644 (file)
--- a/package/proj/Config.in
+++ b/package/proj/Config.in
@@ -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