From 75cf503cc714aa1d74189f22710f2cfa17723d8b Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sat, 8 Feb 2025 20:56:51 +0800 Subject: [PATCH] fix build with latest cflags --- gdal.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gdal.spec b/gdal.spec index 73ac7c3..1531003 100644 --- a/gdal.spec +++ b/gdal.spec @@ -23,7 +23,7 @@ Name: gdal Version: 3.7.3 -Release: 2 +Release: 3 Summary: GIS file format library License: MIT URL: http://www.gdal.org @@ -39,7 +39,6 @@ Patch0: gdal_utils.patch Patch1: 0001-Fix-build-error-with-libxml2-2.12.patch Patch2: 0002-Fix-build-error-with-pre-installed-version-in-the-PA.patch - BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gmock-devel @@ -195,6 +194,9 @@ rm -rf third_party/LercLib tar xf %{SOURCE1} mv %{name}autotest-%{version} autotest +# autotest/cpp uses private -O0 where it does not like any level of FORTIFY_SOURCE +sed -i -e 's/-D_FORTIFY_SOURCE=2/%{?_fortify_level_flags}%{!?_fortify_level_flags:-Wp,-D_FORTIFY_SOURCE=2}/g' autotest/cpp/CMakeLists.txt + # Need to patch autotest %autopatch -p1 @@ -205,7 +207,6 @@ mv %{name}autotest-%{version} autotest -DGDAL_USE_JPEG12_INTERNAL=OFF \ -DENABLE_DEFLATE64=OFF \ -DGDAL_USE_LERC_INTERNAL=OFF -sed -i "s#-Wp, -Wp,#-Wp,#g" `grep "Wp, -Wp," -rl ./` %cmake_build %if %{with mingw} @@ -335,6 +336,9 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_jnidir}/%{name}/gdal-%{version}-javadoc.jar %changelog +* Fri Jan 24 2025 Funda Wang - 3.7.3-3 +- fix build with latest cflags + * Fri Nov 15 2024 Dongxing Wang - 3.7.3-2 - Fix gdal-config-64 missing -- Gitee