Source: nspr
Severity: wishlist
Tags: patch

Dear Maintainer,

Hi there,

Forwarding along an Ubuntu patch in hopes of dropping some more delta.

>From what I've quickly googled armhf is Thumb2 for you as well.  I'm
less certain about armel for debian, so maybe that's not needed for you.
FWIW, Ubuntu has dropped armel as an architecture, so we could drop
that out of the patch (but its harmless if you do keep it).


-- System Information:
Debian Release: stretch/sid
  APT prefers yakkety-updates
  APT policy: (500, 'yakkety-updates'), (500, 'yakkety-security'), (500, 
'yakkety'), (400, 'yakkety-proposed')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.8.0-34-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 9dd7530d36251254a0757e67a2577d2c8ece841b Mon Sep 17 00:00:00 2001
From: Jon Grimm <[email protected]>
Date: Fri, 24 Jun 2016 00:51:06 -0500
Subject: [PATCH 05/10]     - rules: Enable Thumb2 build on armel, armhf.

(cherry picked from commit 0e35bdb9cc2aade596997d3c5353bb46e6dabb8d)
---
 debian/rules | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/debian/rules b/debian/rules
index 11733a0..be53c6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include debian/make.mk
+include /usr/share/dpkg/architecture.mk
 # Use dpkg-buildflags to get hardening flags, and exclude non-hardening flags
 dpkg_buildflags = $(and $(1),$(shell DEB_CFLAGS_MAINT_STRIP="$(shell DEB_BUILD_MAINT_OPTIONS=hardening=-all dpkg-buildflags --get $(1))" dpkg-buildflags --get $(1)))
 $(call lazy,CFLAGS,$$(call dpkg_buildflags,CFLAGS))
@@ -29,6 +30,10 @@ ifeq (x32,$(shell dpkg-architecture -qDEB_HOST_ARCH))
 	CONFIGURE_FLAGS += --enable-x32
 endif
 
+ifneq (,$(findstring $(DEB_HOST_ARCH),armel armhf))
+	CONFIGURE_FLAGS += --enable-thumb2
+endif
+
 $(call lazy,DEB_HOST_MULTIARCH,$$(shell dpkg-architecture -qDEB_HOST_MULTIARCH))
 $(call lazy,BUILD_DATE,$$(shell dpkg-parsechangelog -S Date))
 
-- 
2.9.3

Reply via email to