Accepting request 1153885 from home:pluskalm:branches:Application:Geo

- Fix building on Leap

OBS-URL: https://build.opensuse.org/request/show/1153885
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/PDAL?expand=0&rev=37
This commit is contained in:
Martin Pluskal 2024-03-01 12:52:49 +00:00 committed by Git OBS Bridge
parent 1410f4840b
commit a9a1ae5013
2 changed files with 13 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 1 10:53:46 UTC 2024 - Martin Pluskal <mpluskal@suse.com>
- Fix building on Leap
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 1 07:33:55 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Fri Mar 1 07:33:55 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

View File

@ -45,7 +45,6 @@ BuildRequires: curl-devel
BuildRequires: eigen3-devel BuildRequires: eigen3-devel
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: freeglut-devel BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: gdal BuildRequires: gdal
BuildRequires: geotiff-devel BuildRequires: geotiff-devel
BuildRequires: gtest BuildRequires: gtest
@ -95,6 +94,11 @@ Provides: bundled(PoissonRecon)
Provides: bundled(nanoflann) Provides: bundled(nanoflann)
# https://github.com/nlohmann/json bundled in vendor/nlohmann # https://github.com/nlohmann/json bundled in vendor/nlohmann
Provides: bundled(nlohmann) Provides: bundled(nlohmann)
%if 0%{?suse_version} < 1550
BuildRequires: gcc12-c++
%else
BuildRequires: gcc-c++ >= 11
%endif
%description %description
PDAL is a C++ BSD library for translating and manipulating point cloud data. PDAL is a C++ BSD library for translating and manipulating point cloud data.
@ -179,6 +183,9 @@ find ./doc/ -type f -iname "*.ai" -delete
# boo#1194109 and upstream https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102059 # boo#1194109 and upstream https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102059
%define _lto_cflags %{nil} %define _lto_cflags %{nil}
%endif %endif
%if 0%{?suse_version} < 1550
export CXX=g++-12
%endif
%cmake \ %cmake \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \