From: Peter Michael Green <plugwash@raspbian.org>
Date: Tue, 14 Mar 2023 14:31:55 +0000 (+0000)
Subject: Manual merge of version 1.0.3-2+rpi1 and 1.0.3-3 to produce 1.0.3-3+rpi1
X-Git-Tag: archive/raspbian/1.0.3-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=76ec04c2a990ed3ff2b5dfa5d532e31e303d945c;p=highway.git

Manual merge of version 1.0.3-2+rpi1 and 1.0.3-3 to produce 1.0.3-3+rpi1
---

418268094f8331f5f711b0508defb89f8680c4ee
diff --cc debian/changelog
index ee2466b,93fad7d..210e069
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- highway (1.0.3-2+rpi1) bookworm-staging; urgency=medium
++highway (1.0.3-3+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.0.2-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 17 Jan 2023 11:23:31 +0000]
 +  * disable armv7 mode, despite claim in debian/rules that
 +    "highway implement dynamic dispatch" this appears to cause all code to be
 +    built with -march=armv7-a.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Mon, 13 Feb 2023 18:57:53 +0000
++ -- Peter Michael Green <plugwash@debian.org>  Tue, 14 Mar 2023 14:31:10 +0000
++
+ highway (1.0.3-3) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Fix FTCBFS: (Closes: #1024244)
+   * Fix a pile of build vs host confusions.
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Fri, 24 Feb 2023 08:52:20 +0100
  
  highway (1.0.3-2) unstable; urgency=medium
  
diff --cc debian/rules
index ebe9888,50126af..21c5117
--- a/debian/rules
+++ b/debian/rules
@@@ -17,12 -17,14 +17,14 @@@ ifneq (,$(filter $(DEB_HOST_ARCH), arme
    DEB_CXXFLAGS_MAINT_APPEND += -Wno-psabi
  endif
  
- #ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH),armhf))
 -ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),armhf))
 -  # highway implement dynamic dipatch:
 -  # https://github.com/google/highway/issues/891
 -  CMAKE_EXTRA_FLAGS += -DHWY_CMAKE_ARM7:BOOL=ON
 -endif
++#ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),armhf))
 +#  # highway implement dynamic dipatch:
 +#  # https://github.com/google/highway/issues/891
 +#  CMAKE_EXTRA_FLAGS += -DHWY_CMAKE_ARM7:BOOL=ON
 +#endif
  
+ include /usr/share/dpkg/buildtools.mk
+ 
  export DEB_CXXFLAGS_MAINT_APPEND
  
  # test suite rely on CMAKE_SKIP_RPATH=OFF