From: Mathieu Malaterre <malat@debian.org>
Date: Fri, 30 Jun 2023 12:05:27 +0000 (+0200)
Subject: d/rules: Remove gnu extensions, only strict c++17
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~51
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab2fd2a68c9b2cc6a022d4b8debe4586499f44cd;p=dcmtk.git

d/rules: Remove gnu extensions, only strict c++17
---

diff --git a/debian/rules b/debian/rules
index 5b2a3c8d..3451d8fa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,23 +26,25 @@ export DEB_CXXFLAGS_MAINT_APPEND=-DENABLE_DCMJPLS_INTERLEAVE_NONE
 
 # SKIP_RPATH=OFF to run test suite:
 # see #701231
-CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
+CMAKE_EXTRA_FLAGS += \
  -DBUILD_SHARED_LIBS:BOOL=ON \
- -DDCMTK_WITH_OPENSSL:BOOL=ON \
+ -DCMAKE_BUILD_TYPE:STRING=None \
+ -DCMAKE_CXX_EXTENSIONS:BOOL=OFF \
+ -DCMAKE_CXX_STANDARD:STRING=17 \
+ -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk18 \
+ -DCMAKE_SKIP_RPATH:BOOL=OFF \
+ -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON \
- -DDCMTK_WITH_XML:BOOL=ON \
+ -DDCMTK_ENABLE_STL:BOOL=ON \
  -DDCMTK_WITH_DOXYGEN:BOOL=$(BUILDDOC) \
- -DDCMTK_WITH_TIFF:BOOL=ON \
- -DDCMTK_WITH_ZLIB:BOOL=ON \
  -DDCMTK_WITH_ICONV:BOOL=OFF \
  -DDCMTK_WITH_ICU:BOOL=OFF \
+ -DDCMTK_WITH_OPENSSL:BOOL=ON \
  -DDCMTK_WITH_STDLIBC_ICONV:BOOL=OFF \
+ -DDCMTK_WITH_TIFF:BOOL=ON \
+ -DDCMTK_WITH_XML:BOOL=ON \
+ -DDCMTK_WITH_ZLIB:BOOL=ON \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk18 \
- -DCMAKE_SKIP_RPATH:BOOL=OFF \
- -DDCMTK_ENABLE_STL:BOOL=ON \
- -DCMAKE_CXX_STANDARD:STRING=17
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)