From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 11 May 2023 20:32:47 +0000 (+0000)
Subject: Fix key error in media/libvpx/moz.build
X-Git-Tag: archive/raspbian/1%102.9.0-1_deb10u1+rpi1~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9a72722b6b71861836cf59e664b3f994186a31fe;p=thunderbird.git

Fix key error in media/libvpx/moz.build
---

diff --git a/debian/changelog b/debian/changelog
index 6a92b16341..cb95363bd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,6 +45,9 @@ thunderbird (1:102.9.0-1~deb10u1+rpi1) buster-staging; urgency=medium
     + Pass disable-jit from debian/rules
     + Nerf jit detection in s/moz.configure
 
+  [changes brought over from firefox-esr 102.9.0esr-1~deb10u1+rpi1 by Peter Michael Green]
+  * Fix key error in media/libvpx/moz.build
+
  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 04 Apr 2023 01:50:41 +0000
 
 thunderbird (1:102.9.0-1~deb10u1) buster-security; urgency=medium
diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build
index d8c82b392a..491689727a 100644
--- a/media/libvpx/moz.build
+++ b/media/libvpx/moz.build
@@ -37,7 +37,7 @@ elif CONFIG['CPU_ARCH'] == 'x86':
     else: # Android, Linux, BSDs, etc.
         ASFLAGS += [ '-I%s/media/libvpx/config/linux/ia32/' % TOPSRCDIR ]
         LOCAL_INCLUDES += [ '/media/libvpx/config/linux/ia32/' ]
-elif CONFIG['CPU_ARCH'] == 'arm':
+elif (CONFIG['CPU_ARCH'] == 'arm') and ('ARM_EXPORTS' in files):
     EXPORTS.vpx += files['ARM_EXPORTS']
     ASFLAGS += [
         '-I%s/media/libvpx/config/linux/arm/' % TOPSRCDIR,