[med-svn] [Git][med-team/dcmtk][debian/experimental] 2 commits: removed embedded build path from DCMTKConfig.cmake

[Andreas Beckmann (@anbe)]

Andreas Beckmann pushed to branch debian/experimental at Debian Med / dcmtk


Commits:
83d06b33 by Andreas Beckmann at 2024-04-25T18:45:40+02:00
removed embedded build path from DCMTKConfig.cmake

- - - - -
041818c2 by Andreas Beckmann at 2024-04-26T11:15:23+02:00
build reproducibly without rpath and set LD_LIBRARY_PATH for running tests

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -34,15 +34,13 @@ export DEB_CXXFLAGS_MAINT_APPEND
 %:
 	dh $@ --buildsystem=cmake
 
-# SKIP_RPATH=OFF to run test suite:
-# see #701231
 CMAKE_EXTRA_FLAGS += \
  -DBUILD_SHARED_LIBS: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_SKIP_RPATH:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
  -DDCMTK_ENABLE_PRIVATE_TAGS:BOOL=ON \
  -DDCMTK_ENABLE_STL:BOOL=ON \
@@ -67,15 +65,18 @@ override_dh_auto_build-arch:
 	# need man page in -arch packages:
 	#$(MAKE) -C obj-* man
 	dh_auto_build
+	sed -i 's% -ffile-prefix-map=[^ ]* % %' obj-*/CMakeFiles/DCMTKConfig.cmake
 
 # Let's be smart with building doc
 override_dh_auto_build-indep:
 	$(MAKE) -C obj-* DOXYGEN
 
+override_dh_auto_test-arch:
+	LD_LIBRARY_PATH=$(wildcard $(CURDIR)/obj-*/lib):$(LD_LIBRARY_PATH) dh_auto_test
+
 # No tests needed for docs
 override_dh_auto_test-indep:
 
-
 override_dh_auto_install-arch:
 	dh_auto_install
 



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/f4c27faad1a6420f5050ee251fecb3353d973055...041818c2238cffbd2af23681297564f982bf45f7

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/f4c27faad1a6420f5050ee251fecb3353d973055...041818c2238cffbd2af23681297564f982bf45f7
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/20240426/58403c1e/attachment-0001.htm>