Bläddra i källkod

package/proj: needs NPTL

NPTL is mandatory since bump to version 9.3.0 in commit
57aba033e6cc81b95d006227c45a15eb3fc77d07 and
https://github.com/OSGeo/PROJ/commit/ce080251225d16e11e139a5ebe07cf608fe022b2:

/home/buildroot/instance-0/output-1/build/proj-9.3.0/src/iso19111/factory.cpp: In member function 'std::shared_ptr<osgeo::proj::io::SQLiteHandle> osgeo::proj::io::SQLiteHandleCache::getHandle(const std::string&, PJ_CONTEXT*)':
/home/buildroot/instance-0/output-1/build/proj-9.3.0/src/iso19111/factory.cpp:622:9: error: 'pthread_atfork' was not declared in this scope; did you mean 'pthread_attr_t'?
  622 |         pthread_atfork(nullptr, nullptr,
      |         ^~~~~~~~~~~~~~
      |         pthread_attr_t

Fixes: 57aba033e6cc81b95d006227c45a15eb3fc77d07
 - http://autobuild.buildroot.org/results/392664375c5bc5f047d39bff31534a226e8ea526

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Maxim Kochetkov <fido_max@inbox.ru>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 4eeb69c9835450da8af8f55c776a7774914e2102)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 1 år sedan
förälder
incheckning
222220d06e
4 ändrade filer med 12 tillägg och 12 borttagningar
  1. 3 3
      package/gdal/Config.in
  2. 3 3
      package/libgeotiff/Config.in
  3. 3 3
      package/postgis/Config.in
  4. 3 3
      package/proj/Config.in

+ 3 - 3
package/gdal/Config.in

@@ -6,7 +6,7 @@ config BR2_PACKAGE_GDAL
 	depends on !BR2_STATIC_LIBS
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
-	depends on BR2_TOOLCHAIN_HAS_THREADS # proj
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj
 	depends on BR2_USE_WCHAR # proj
 	depends on BR2_USE_WCHAR # proj
 	select BR2_PACKAGE_GIFLIB
 	select BR2_PACKAGE_GIFLIB
 	select BR2_PACKAGE_JPEG
 	select BR2_PACKAGE_JPEG
@@ -26,9 +26,9 @@ config BR2_PACKAGE_GDAL
 
 
 	  https://gdal.org/
 	  https://gdal.org/
 
 
-comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, threads, wchar"
+comment "gdal needs a toolchain w/ C++, dynamic library, gcc >= 4.7, not binutils bug 27597, NPTL, wchar"
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on BR2_TOOLCHAIN_HAS_SYNC_4
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
 	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
 		BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \
 		BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR

+ 3 - 3
package/libgeotiff/Config.in

@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGEOTIFF
 	bool "libgeotiff"
 	bool "libgeotiff"
 	depends on BR2_INSTALL_LIBSTDCPP # proj
 	depends on BR2_INSTALL_LIBSTDCPP # proj
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # proj
-	depends on BR2_TOOLCHAIN_HAS_THREADS # proj
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj
 	depends on BR2_USE_WCHAR # proj
 	depends on BR2_USE_WCHAR # proj
 	select BR2_PACKAGE_PROJ
 	select BR2_PACKAGE_PROJ
 	select BR2_PACKAGE_TIFF
 	select BR2_PACKAGE_TIFF
@@ -12,7 +12,7 @@ config BR2_PACKAGE_LIBGEOTIFF
 
 
 	  https://github.com/OSGeo/libgeotiff
 	  https://github.com/OSGeo/libgeotiff
 
 
-comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar"
+comment "libgeotiff needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR

+ 3 - 3
package/postgis/Config.in

@@ -3,7 +3,7 @@ config BR2_PACKAGE_POSTGIS
 	depends on BR2_PACKAGE_POSTGRESQL_FULL
 	depends on BR2_PACKAGE_POSTGRESQL_FULL
 	depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj
 	depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libgeos
-	depends on BR2_TOOLCHAIN_HAS_THREADS # libgeos, proj
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj
 	depends on BR2_USE_WCHAR # libgeos, proj
 	depends on BR2_USE_WCHAR # libgeos, proj
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos
 	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos
 	select BR2_PACKAGE_LIBGEOS
 	select BR2_PACKAGE_LIBGEOS
@@ -18,7 +18,7 @@ config BR2_PACKAGE_POSTGIS
 
 
 	  https://postgis.net/
 	  https://postgis.net/
 
 
-comment "postgis needs a toolchain w/ C++, threads, wchar, gcc >= 4.9, not binutils bug 27597"
+comment "postgis needs a toolchain w/ C++, NPTL, wchar, gcc >= 4.9, not binutils bug 27597"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR || \
 		BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
 		BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597

+ 3 - 3
package/proj/Config.in

@@ -2,7 +2,7 @@ config BR2_PACKAGE_PROJ
 	bool "proj"
 	bool "proj"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11
-	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
 	depends on BR2_USE_WCHAR
 	depends on BR2_USE_WCHAR
 	select BR2_PACKAGE_SQLITE
 	select BR2_PACKAGE_SQLITE
 	help
 	help
@@ -14,7 +14,7 @@ config BR2_PACKAGE_PROJ
 
 
 	  http://proj4.org/
 	  http://proj4.org/
 
 
-comment "proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar"
+comment "proj needs a toolchain w/ C++, gcc >= 4.7, NPTL, wchar"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \
-		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR