[med-svn] [Git][med-team/dcmtk][debian/experimental] 3 commits: d/rules: Remove gnu extensions, only strict c++17

Mathieu Malaterre (@malat) gitlab at salsa.debian.org
Fri Jun 30 14:07:01 BST 2023



Mathieu Malaterre pushed to branch debian/experimental at Debian Med / dcmtk


Commits:
ab2fd2a6 by Mathieu Malaterre at 2023-06-30T14:05:27+02:00
d/rules: Remove gnu extensions, only strict c++17

- - - - -
60605fae by Mathieu Malaterre at 2023-06-30T12:18:42+00:00
d/rules: Do not build test suite if not required

- - - - -
f22531de by Mathieu Malaterre at 2023-06-30T14:19:18+02:00
d/changelog: Upload 3.6.8~git20221024.b8950f9-2 to experimental

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+dcmtk (3.6.8~git20221024.b8950f9-2) experimental; urgency=medium
+
+  * d/control: Reduce number of dependencies for -dev package
+  * d/rules: Remove gnu extensions, only strict c++17
+  * d/rules: Do not build test suite if not required
+
+ -- Mathieu Malaterre <malat at debian.org>  Fri, 30 Jun 2023 14:19:10 +0200
+
 dcmtk (3.6.8~git20221024.b8950f9-1) experimental; urgency=medium
 
   * New upstream version 3.6.8~git20221024.b8950f9


=====================================
debian/rules
=====================================
@@ -26,23 +26,29 @@ 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
+
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+  CMAKE_EXTRA_FLAGS += -DBUILD_TESTING:BOOL=OFF
+endif
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/f032735429e36f188aeac6e9002255ef00f743ab...f22531de63ff1a9b39c1482a0369183d0749fb34

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/f032735429e36f188aeac6e9002255ef00f743ab...f22531de63ff1a9b39c1482a0369183d0749fb34
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20230630/fe532166/attachment-0001.htm>


More information about the debian-med-commit mailing list