[med-svn] [Git][med-team/libdeflate][master] 2 commits: d/rules: Make build cross-buildale

[Nilesh Patra (@nilesh)]

Nilesh Patra pushed to branch master at Debian Med / libdeflate


Commits:
aca22de1 by Nilesh Patra at 2021-08-22T01:16:52+05:30
d/rules: Make build cross-buildale

- - - - -
4da18fee by Nilesh Patra at 2021-08-22T01:16:52+05:30
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+libdeflate (1.7-2) unstable; urgency=medium
+
+  * Team Upload
+  * Fix FTCBFS: (Closes: #989942)
+    + Let dh_auto_build pass cross tools to make.
+    + Automatically skip pgo when DEB_BUILD_PROFILES contains cross.
+    Thanks to Helmut Grohne!
+
+ -- Nilesh Patra <nilesh at debian.org>  Sun, 22 Aug 2021 01:14:54 +0530
+
 libdeflate (1.7-1) unstable; urgency=medium
 
   * New upstream version


=====================================
debian/rules
=====================================
@@ -7,30 +7,34 @@ export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 %:
 	dh $@
 
+ifeq (,$(filter cross,$(DEB_BUILD_PROFILES)))
+PROFILING_FLAG = -fprofile-use
+else
+PROFILING_FLAG =
+endif
 
 override_dh_auto_build:
-	make CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -fprofile-generate" \
+ifeq (,$(filter cross,$(DEB_BUILD_PROFILES)))
+	dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -fprofile-generate" \
 		LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -fprofile-generate"\
 		CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)"\
-		V=1 PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp -j$(shell nproc)\
-		"INSTALL=install --strip-program=true"\
+		V=1 PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp \
 		all test_programs
 	for level in $(shell seq 1 12); do \
 		./benchmark -$${level} ./lib/deflate_compress.c > /dev/null; \
 	done
-	make CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -fprofile-use" \
-		LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -fprofile-use"\
+endif
+	dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(PROFILING_FLAG)" \
+		LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) $(PROFILING_FLAG)"\
 		CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)"\
-		V=1 PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp -j$(shell nproc)\
-		"INSTALL=install --strip-program=true"\
+		V=1 PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp \
 		all test_programs
 
 override_dh_auto_install:
-	make CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -fprofile-use" \
-		LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -fprofile-use"\
+	dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(PROFILING_FLAG)" \
+		LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) $(PROFILING_FLAG)"\
 		CPPFLAGS="$(shell dpkg-buildflags --get CPPFLAGS)"\
-		V=1 PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp -j$(shell nproc)\
-		"INSTALL=install --strip-program=true"\
+		V=1 PREFIX=/usr DESTDIR=$(CURDIR)/debian/tmp \
 		install
 
 override_dh_auto_test:



View it on GitLab: https://salsa.debian.org/med-team/libdeflate/-/compare/6e489ec590a564dfec37a617082adbffea3062da...4da18feed77087335de9b96ff74421ea55300fec

-- 
View it on GitLab: https://salsa.debian.org/med-team/libdeflate/-/compare/6e489ec590a564dfec37a617082adbffea3062da...4da18feed77087335de9b96ff74421ea55300fec
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/20210821/cec2c7dd/attachment-0001.htm>