From 222220d06eaf0fada91c5b651bd3b2d43a4cb0fb Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 4 May 2024 11:34:46 +0200 Subject: [PATCH] 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::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 Reviewed-by: Maxim Kochetkov Signed-off-by: Yann E. MORIN (cherry picked from commit 4eeb69c9835450da8af8f55c776a7774914e2102) Signed-off-by: Peter Korsgaard --- package/gdal/Config.in | 6 +++--- package/libgeotiff/Config.in | 6 +++--- package/postgis/Config.in | 6 +++--- package/proj/Config.in | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/gdal/Config.in b/package/gdal/Config.in index 24a1f06af2..fe96f4a7d9 100644 --- a/package/gdal/Config.in +++ b/package/gdal/Config.in @@ -6,7 +6,7 @@ config BR2_PACKAGE_GDAL depends on !BR2_STATIC_LIBS 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_THREADS # proj + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_GIFLIB select BR2_PACKAGE_JPEG @@ -26,9 +26,9 @@ config BR2_PACKAGE_GDAL 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_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/libgeotiff/Config.in b/package/libgeotiff/Config.in index 7ed296fb25..f07c994361 100644 --- a/package/libgeotiff/Config.in +++ b/package/libgeotiff/Config.in @@ -2,7 +2,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 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # proj depends on BR2_USE_WCHAR # proj select BR2_PACKAGE_PROJ select BR2_PACKAGE_TIFF @@ -12,7 +12,7 @@ config BR2_PACKAGE_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 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR diff --git a/package/postgis/Config.in b/package/postgis/Config.in index 7d42390677..7f85c03007 100644 --- a/package/postgis/Config.in +++ b/package/postgis/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_POSTGIS depends on BR2_PACKAGE_POSTGRESQL_FULL depends on BR2_INSTALL_LIBSTDCPP # libgeos, proj 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_TOOLCHAIN_HAS_BINUTILS_BUG_27597 # libgeos select BR2_PACKAGE_LIBGEOS @@ -18,7 +18,7 @@ config BR2_PACKAGE_POSTGIS 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 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR || \ BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 diff --git a/package/proj/Config.in b/package/proj/Config.in index 1952fc7d9a..6d172e2ee9 100644 --- a/package/proj/Config.in +++ b/package/proj/Config.in @@ -2,7 +2,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 + depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL depends on BR2_USE_WCHAR select BR2_PACKAGE_SQLITE help @@ -14,7 +14,7 @@ config BR2_PACKAGE_PROJ 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 || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_USE_WCHAR