From 94ca52a6ba625c7151fdb6c5ed55ab4fd390cf80 Mon Sep 17 00:00:00 2001 From: =?utf8?q?IOhannes=20m=20zm=C3=B6lnig=20=28Debian/GNU=29?= Date: Thu, 23 Dec 2021 09:47:41 +0100 Subject: [PATCH] Drop hack to make JUCE compile on armel - we just disabled an assert that probably was there for a good reason - there's little point in trying to run audio plugins on armel anyhow -> let's RM 'armel' from the archives! --- debian/patches/armel_lockfree.patch | 23 ----------------------- debian/patches/series | 1 - 2 files changed, 24 deletions(-) delete mode 100644 debian/patches/armel_lockfree.patch diff --git a/debian/patches/armel_lockfree.patch b/debian/patches/armel_lockfree.patch deleted file mode 100644 index 1d5a3442..00000000 --- a/debian/patches/armel_lockfree.patch +++ /dev/null @@ -1,23 +0,0 @@ -Description: allow compilation on armel - we patch out the is_always_lockfree assertion for armel, to allow - compilation. - any armel is probably too weak to actually *run* a JUCE project. -Author: IOhannes m zmölnig -Origin: Debian -Forwarded: not-needed -Last-Update: 2021-12-22 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- juce.orig/modules/juce_core/memory/juce_Atomic.h -+++ juce/modules/juce_core/memory/juce_Atomic.h -@@ -55,8 +55,10 @@ - ~Atomic() noexcept - { - #if __cpp_lib_atomic_is_always_lock_free -+#ifndef __ARMEL__ - static_assert (std::atomic::is_always_lock_free, - "This class can only be used for lock-free types"); -+#endif /* armel */ - #endif - } - diff --git a/debian/patches/series b/debian/patches/series index 931b61c0..15858140 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,3 @@ cross.patch debian_buildcmake.patch overridable_pkg-config.patch debian_cmake.patch -armel_lockfree.patch -- 2.30.2