[med-svn] [Git][med-team/praat][master] 2 commits: d/rules: Avoid FTBFS on armhf

[Rafael Laboissière (@rafael)]

Rafael Laboissière pushed to branch master at Debian Med / praat


Commits:
f59a3f72 by Rafael Laboissière at 2024-01-17T17:19:29-03:00
d/rules: Avoid FTBFS on armhf

Thanks: Emanuele Rocca for the suggestion.

- - - - -
f7aa0850 by Rafael Laboissière at 2024-01-17T17:21:25-03:00
d/changelog: Add entry for release 6.4.04+dfsg-2

Gbp-Dch: Ignore

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+praat (6.4.04+dfsg-2) unstable; urgency=medium
+
+  * d/rules: Avoid FTBFS on armhf.
+    Thanks to Emanuele Rocca for the suggestion.
+
+ -- Rafael Laboissière <rafael at debian.org>  Wed, 17 Jan 2024 17:21:05 -0300
+
 praat (6.4.04+dfsg-1) unstable; urgency=medium
 
   * New upstream version 6.4.04+dfsg


=====================================
debian/rules
=====================================
@@ -13,7 +13,12 @@ APPDIR = usr/share/applications
 SUBSTCMD = sed 's:@BINDIR@:$(BINDIR):g;s:@PIXDIR@:$(PIXDIR):g;	\
                 s:@SVGDIR@:$(SVGDIR):g;s:@APPDIR@:$(APPDIR):g'
 
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+# This is a workaround for Bug#1055750 and Bug#1055228
+ifeq ($(DEB_TARGET_ARCH),armhf)
+    export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-stackclash
+else
+    export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+endif
 
 include /usr/share/dpkg/architecture.mk
 -include /usr/share/dpkg/buildtools.mk



View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/cfc462d9a54b8adc21cee84745fb9d4ddbc8c03a...f7aa08506316110552f719a60c1a275ee4464b5a

-- 
View it on GitLab: https://salsa.debian.org/med-team/praat/-/compare/cfc462d9a54b8adc21cee84745fb9d4ddbc8c03a...f7aa08506316110552f719a60c1a275ee4464b5a
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/20240118/fa8d4732/attachment-0001.htm>