From 494afd8aa426fe51b6f4661bd61c7b7234af7704 Mon Sep 17 00:00:00 2001 From: Raspbian automatic forward porter Date: Sun, 1 Oct 2023 03:01:16 +0100 Subject: [PATCH] Defuzz fuzzy quilt patches and/or disable broken quilt patches --- debian/patches/series | 1 - debian/patches/use-fp-with-march.patch | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 6fdd010..3caed94 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -#fix_library_name.patch test.patch use-fp-with-march.patch diff --git a/debian/patches/use-fp-with-march.patch b/debian/patches/use-fp-with-march.patch index 4f58a29..b89eab1 100644 --- a/debian/patches/use-fp-with-march.patch +++ b/debian/patches/use-fp-with-march.patch @@ -3,12 +3,12 @@ Description: pass -march=armv7+fp when building "armv4" assembler files. neon implementations which won't be built if no -march is specified Author: Peter Michael Green -diff --git a/GNUmakefile b/GNUmakefile -index c0c6916..ae7b8c5 100644 ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -1200,11 +1200,7 @@ endif - # Also see https://www.crypto++.com/wiki/Cryptogams. +Index: tempdefuzz/GNUmakefile +=================================================================== +--- tempdefuzz.orig/GNUmakefile ++++ tempdefuzz/GNUmakefile +@@ -1193,11 +1193,7 @@ endif + # Also see https://www.cryptopp.com/wiki/Cryptogams. ifeq ($(IS_ARM32)$(IS_LINUX),11) ifeq ($(filter -DCRYPTOPP_DISABLE_ASM -DCRYPTOPP_DISABLE_ARM_NEON,$(CRYPTOPP_CPPFLAGS)$(CPPFLAGS)$(CXXFLAGS)),) - # Do not use -march=armv7 if the compiler is already targeting the ISA. -- 2.30.2