[med-svn] [Git][deflate-team/libdeflate][master] 2 commits: d/rules: look for nocheck and nodoc in DEB_BUILD_OPTIONS

[nick black (@nickblack)]

nick black pushed to branch master at deflate team / libdeflate


Commits:
81526396 by Andrea Pappacoda at 2024-08-12T13:37:05+02:00
d/rules: look for nocheck and nodoc in DEB_BUILD_OPTIONS

nocheck and nodoc should be looked up in the DEB_BUILD_OPTIONS
environment variable instead of DEB_BUILD_PROFILES, since
DEB_BUILD_PROFILES=nocheck implies DEB_BUILD_OPTIONS=nocheck, but not
vice versa.

This isn't true for "cross" which isn't a build option but a build
profile.

Gbp-Dch: Full

- - - - -
feff7a9a by Andrea Pappacoda at 2024-08-12T13:37:05+02:00
d/rules: enable CMAKE_BUILD_RPATH_USE_ORIGIN

This should fix reproducibility issues.

Gbp-Dch: Full

- - - - -


1 changed file:

- debian/rules


Changes:

=====================================
debian/rules
=====================================
@@ -12,18 +12,24 @@ endif
 %:
 	dh $@
 
-override_dh_auto_configure:
-ifneq ($(filter nocheck,$(DEB_BUILD_PROFILES)),)
-	dh_auto_configure -- -DLIBDEFLATE_USE_SHARED_LIB=1
+ifneq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ test := OFF
 else
-	dh_auto_configure -- -DLIBDEFLATE_USE_SHARED_LIB=1 -DLIBDEFLATE_BUILD_TESTS=1
+ test := ON
 endif
 
+# -DCMAKE_BUILD_RPATH_USE_ORIGIN=ON can be dropped with debhelper compat 14+
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-DLIBDEFLATE_USE_SHARED_LIB=ON \
+		-DLIBDEFLATE_BUILD_TESTS=$(test) \
+		-DCMAKE_BUILD_RPATH_USE_ORIGIN=ON
+
 execute_after_dh_auto_test:
 	scripts/run_tests.sh regular
 
 override_dh_installman:
-ifeq ($(filter nodoc cross,$(DEB_BUILD_PROFILES)),)
+ifeq ($(filter nodoc cross,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)),)
 	LD_LIBRARY_PATH=$(CURDIR)/debian/libdeflate0/usr/lib/$(DEB_HOST_MULTIARCH) \
 		help2man --no-info --help-option=-h --version-option=-V \
 		-n "Compress the specified FILEs" \



View it on GitLab: https://salsa.debian.org/deflate-team/libdeflate/-/compare/8146d196fffda1636589767511eacfefc25ba711...feff7a9aac0aa0db698876cccf1acfbdf1f66ae0

-- 
View it on GitLab: https://salsa.debian.org/deflate-team/libdeflate/-/compare/8146d196fffda1636589767511eacfefc25ba711...feff7a9aac0aa0db698876cccf1acfbdf1f66ae0
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/20240813/17d49d60/attachment-0001.htm>