Built and smoke tested on all 3 architectures (i686 and armv7h
in a VM only).
Below is the output of 'git format-patch --stdout origin/HEAD'.
Every change has the appropriate commit message, so it's easier
to understand what's been changed for what reason.
From 3f4f008784d894819a8b244e8a3f593aabf2d3a0 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 22:43:00 +0200
Subject: [PATCH 1/8] Sync with changes from Arch Firefox 72.0.2-1
---
libre/iceweasel/PKGBUILD | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index c701dc37f..91fdd424d 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -46,7 +46,7 @@
pkgname=iceweasel
replaces=('firefox')
epoch=1
-pkgver=72.0.1
+pkgver=72.0.2
pkgrel=1
pkgrel+=.parabola1
_brandingver=70.0
@@ -98,7 +98,6 @@ prepare() {
cd firefox-$pkgver
# https://bugzilla.mozilla.org/show_bug.cgi?id=1530052
- msg "applying 0001-Use-remoting-name-for-GDK-application-names.patch"
patch -Np1 -i ../0001-Use-remoting-name-for-GDK-application-names.patch
cat >../mozconfig <<END
@@ -167,14 +166,14 @@ END
;;
x86_64)
;;
- *) error "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
+ *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
;;
esac
## branding ##
- msg2 "applying parabola branding"
+ echo "applying parabola branding"
local brandingsrcdir="${srcdir}/${pkgname}-${_brandingver}"
local brandingdestdir=browser/branding/${pkgname}
rm -rf -- ${brandingdestdir}
@@ -216,7 +215,7 @@ END
## libre patching ##
# Remove remaining non-free bits
- msg "applying libre.patch"
+ echo "applying libre.patch"
patch -Np1 -i "$srcdir/libre.patch"
# Disable various components at the source level
@@ -237,7 +236,7 @@ END
# local _remove_engines_sed='s|.*oogle.*| "ddg", "duckduckgo-html",
"duckduckgo-lite", "internet-archive", "parabola-labs", "parabola-packages",
"parabola-wiki-en", "searx", "wikipedia", "yacy"|g'
local _remove_engines_sed='s|.*oogle.*| "ddg", "wikipedia"|g'
local _search_config_file=browser/components/search/extensions/list.json
- msg "applying libre-searchengines.patch"
+ echo "applying libre-searchengines.patch"
patch -Np1 -i "$srcdir/libre-searchengines.patch"
sed -i "${_remove_engines_sed}" ${_search_config_file}
@@ -288,13 +287,13 @@ build() {
;;
x86_64)
# Do 3-tier PGO
- msg2 "Building instrumented browser..."
+ echo "Building instrumented browser..."
cat >.mozconfig ../mozconfig - <<END
ac_add_options --enable-profile-generate=cross
END
./mach build
- msg2 "Profiling instrumented browser..."
+ echo "Profiling instrumented browser..."
./mach package
LLVM_PROFDATA=llvm-profdata \
JARLOG_FILE="$PWD/jarlog" \
@@ -302,16 +301,16 @@ END
./mach python build/pgo/profileserver.py
if [[ ! -s merged.profdata ]]; then
- error "No profile data produced."
+ echo "No profile data produced."
return 1
fi
if [[ ! -s jarlog ]]; then
- error "No jar log produced."
+ echo "No jar log produced."
return 1
fi
- msg2 "Removing instrumented browser..."
+ echo "Removing instrumented browser..."
./mach clobber
cat >.mozconfig ../mozconfig - <<END
@@ -321,17 +320,17 @@ ac_add_options
--with-pgo-profile-path=${PWD@Q}/merged.profdata
ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog
END
;;
- *) error "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
+ *) echo "no [ARCH-SPECIFIC CONFIG] for arch: ${CARCH}" ; return 1 ;
;;
esac
# sanity check
- [[ ! -f .mozconfig ]] && error ".mozconfig file not found in source root" &&
return 1
+ [[ ! -f .mozconfig ]] && echo ".mozconfig file not found in source root" &&
return 1
- msg2 "Building optimized browser..."
+ echo "Building optimized browser..."
./mach build
- msg2 "Building symbol archive..."
+ echo "Building symbol archive..."
./mach buildsymbols
}
@@ -405,7 +404,7 @@ END
;;
x86_64)
;;
- *) error "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;
+ *) echo "no [ARCH-SPECIFIC INSTALL] for arch: ${CARCH}" ; return 1 ;
;;
esac
@@ -420,3 +419,4 @@ END
fi
}
+# vim:set sw=2 et:
--
2.25.0
From 1ab1d17207625300e4e8e33ca8eea026c402061f Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 22:47:50 +0200
Subject: [PATCH 2/8] Sync with changes from Arch Linux ARM Firefox 72.0.2-1
---
libre/iceweasel/PKGBUILD | 50 ++++++++++++++++++++++++++++++++++-----
libre/iceweasel/arm.patch | 8 ++++---
2 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 91fdd424d..bce5754e0 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -4,6 +4,7 @@
# Maintainer (connochaetos): Henry Jensen <hjen...@connochaetos.org>
# Maintainer (arch32): Andreas Baumann <m...@andreasbaumann.cc>
# Contributor (arch32): Erich Eckner <g...@eckner.net>
+# Contributor (Arch Linux ARM): Kevin Mihelich <ke...@archlinuxarm.org>
# Contributor: Andreas Grapentin <andr...@grapentin.org>
# Contributor: Luke Shumaker <luke...@parabola.nu>
# Contributor: André Silva <emulator...@hyperbola.info>
@@ -34,6 +35,8 @@
# technical:
# - build i686 with GCC instead of clang
# - disable rust-SIMD, LTO, PGO, and skip profiling build for i686
+# - mozconfig changes for ARM
+# - revert change for clang that breaks gcc build on ARM
#
# privacy:
# - Remove Google API keys and usage
@@ -79,6 +82,8 @@
source+=(https://repo.parabola.nu/other/iceweasel/${pkgname}_${_brandingver}-${_
vendor.js.in)
source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
'avoid-libxul-OOM-python-check.patch')
+source_armv7h=('arm.patch'
+ 'build-arm-libopus.patch')
sha256sums=('1fa59aedc8469c3e6ffb12449ab7de2f93776f7679eedebfb74aa309b694956f'
'SKIP'
'5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
@@ -90,6 +95,8 @@
sha256sums=('1fa59aedc8469c3e6ffb12449ab7de2f93776f7679eedebfb74aa309b694956f'
'4979e733215492372c196cdb93ec61eac1fbbd44f44e637dbd420040c8d9affe')
sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
'5a3e038a57c4576dcb88766d41cbfda5ad109d5cfe41d2000f7ba25563bf00f2')
+sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
+
'2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
validpgpkeys=('14F26682D0916CDD81E37B6D61B7B526D98F0353') # Mozilla Software
Releases <rele...@mozilla.com>
validpgpkeys+=('BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin
@@ -142,7 +149,30 @@ END
## [ARCH-SPECIFIC CONFIG] ##
case ${CARCH} in
armv7h)
- error "armv7h support is not implemented" ; return 1 ; # FIXME:
+ sed -i '
+ /--enable-hardening/d
+ /--enable-optimize/d
+ /--enable-rust-simd/d
+ ' ../mozconfig
+
+ # EME build option appears to be not available for ARM, and EME is
disabled anyway
+ # in the built package, but better check if it exists for ARM each new
release.
+ sed -i '/--disable-eme/d' ../mozconfig
+
+ cat >>../mozconfig <<END
+export CC=clang
+export CXX=clang++
+ac_add_options --disable-webrtc
+ac_add_options --disable-elf-hack
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1641623
+ac_add_options --disable-av1
+ac_add_options --enable-optimize="-g0 -O2"
+mk_add_options MOZ_MAKE_FLAGS="-j2"
+END
+
+ patch -p1 -i "$srcdir"/arm.patch
+ patch -p1 -i "$srcdir"/build-arm-libopus.patch
;;
i686)
# disable LTO and use gcc toolchain (clang has issues on IA32)
@@ -255,10 +285,12 @@ build() {
# LTO needs more open files
ulimit -n 4096
- # -fno-plt with cross-LTO causes obscure LLVM errors
- # LLVM ERROR: Function Import: link error
- CFLAGS="${CFLAGS/-fno-plt/}"
- CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+ if [[ $CARCH != armv7h ]]; then
+ # -fno-plt with cross-LTO causes obscure LLVM errors
+ # LLVM ERROR: Function Import: link error
+ CFLAGS="${CFLAGS/-fno-plt/}"
+ CXXFLAGS="${CXXFLAGS/-fno-plt/}"
+ fi
# DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments'
CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
@@ -267,7 +299,13 @@ build() {
## [ARCH-SPECIFIC CONFIG] ##
case ${CARCH} in
armv7h)
- error "armv7h support is not implemented" ; return 1 ; # FIXME:
+ export MOZ_DEBUG_FLAGS=" "
+ export CFLAGS+=" -g0"
+ export CXXFLAGS+=" -g0"
+ export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
+ export RUSTFLAGS="-Cdebuginfo=0"
+
+ cp ../mozconfig .mozconfig
;;
i686)
# do not do profiling on i686: ..or it will for sure run out of memory -
it doesn't find libraries:
diff --git a/libre/iceweasel/arm.patch b/libre/iceweasel/arm.patch
index c0f15ee60..9e2ed1510 100644
--- a/libre/iceweasel/arm.patch
+++ b/libre/iceweasel/arm.patch
@@ -1,6 +1,8 @@
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp
b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f847..0f3461af16 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
+https://bugzilla.mozilla.org/show_bug.cgi?id=1526653
+
+diff --git a/js/src/wasm/WasmSignalHandlers.cpp.orig
b/js/src/wasm/WasmSignalHandlers.cpp
+index 636537f..0f3461a 100644
+--- a/js/src/wasm/WasmSignalHandlers.cpp.orig
+++ b/js/src/wasm/WasmSignalHandlers.cpp
@@ -244,7 +244,7 @@ using mozilla::DebugOnly;
// emulation here.
--
2.25.0
From 741aacd83d93cddacecdedca41dc1d1c3be6465b Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 22:56:07 +0200
Subject: [PATCH 3/8] Drop patching of source code comments and non-user-facing
documentation
There are 2k+ files in Firefox source code that contain
'Firefox' (case sensitive). I guess it's not practical to patch them
all that way. Batch search and replace looks like a better approach,
more like in Abrowser from Trisquel.
---
libre/iceweasel/libre.patch | 41 -------------------------------------
1 file changed, 41 deletions(-)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 018ab6e5d..3dbc2cad0 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -15,21 +15,6 @@ index ecb82a2..5d522ef 100644
-# addon install
-origin install 1 https://private-network.firefox.com
-origin install 1 https://fpn.firefox.com
-diff --git a/browser/components/newtab/docs/index.rst
b/browser/components/newtab/docs/index.rst
-index ea1e42a..855b245 100644
---- a/browser/components/newtab/docs/index.rst
-+++ b/browser/components/newtab/docs/index.rst
-@@ -1,8 +1,8 @@
- ======================
--Firefox Home (New Tab)
-+Iceweasel Home (New Tab)
- ======================
-
--All files related to Firefox Home, which includes content that appears on
`about:home`,
-+All files related to Iceweasel Home, which includes content that appears on
`about:home`,
- `about:newtab`, and `about:welcome`, can we found in the
`browser/components/newtab` directory.
- Some of these source files (such as `.js`, `.jsx`, and `.sass`) require an
additional build step.
- We are working on migrating this to work with `mach`, but in the meantime,
please
diff --git a/browser/components/preferences/in-content/sync.inc.xhtml
b/browser/components/preferences/in-content/sync.inc.xhtml
index 7d37d26..4ebbc06 100644
--- a/browser/components/preferences/in-content/sync.inc.xhtml
@@ -57,19 +42,6 @@ index 7d37d26..4ebbc06 100644
</groupbox>
<vbox id="hasFxaAccount">
-diff --git a/browser/locales/en-US/browser/newtab/newtab.ftl
b/browser/locales/en-US/browser/newtab/newtab.ftl
-index 0737833..7cb90d6 100644
---- a/browser/locales/en-US/browser/newtab/newtab.ftl
-+++ b/browser/locales/en-US/browser/newtab/newtab.ftl
-@@ -2,7 +2,7 @@
- # License, v. 2.0. If a copy of the MPL was not distributed with this
- # file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
--### Firefox Home / New Tab strings for about:home / about:newtab.
-+### Iceweasel Home / New Tab strings for about:home / about:newtab.
-
- newtab-page-title = New Tab
- newtab-settings-button =
diff --git a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
b/browser/locales/en-US/browser/policies/policies-descriptions.ftl
index dabfadc..3ce732e 100644
--- a/browser/locales/en-US/browser/policies/policies-descriptions.ftl
@@ -193,19 +165,6 @@ index 2d3c7b4..00221d3 100644
</dl>
-#endif
</dl>
-diff --git a/devtools/client/locales/en-US/sourceeditor.properties
b/devtools/client/locales/en-US/sourceeditor.properties
-index 9427244..c17d490 100644
---- a/devtools/client/locales/en-US/sourceeditor.properties
-+++ b/devtools/client/locales/en-US/sourceeditor.properties
-@@ -4,7 +4,7 @@
-
- # LOCALIZATION NOTE These strings are used inside the Source Editor component.
- # This component is used whenever source code is displayed for the purpose of
--# being edited, inside the Firefox developer tools (like Style Editor).
-+# being edited, inside the Iceweasel developer tools (like Style Editor).
-
- # LOCALIZATION NOTE The correct localization of this file might be to keep it
- # in English, or another language commonly spoken among web developers.
diff --git a/devtools/client/whats-new/src/main.js
b/devtools/client/whats-new/src/main.js
index 0a31843..c01e488 100644
--- a/devtools/client/whats-new/src/main.js
--
2.25.0
From 30c86b1890459b75bfcb5be870b8a30310cc9dc1 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 22:59:13 +0200
Subject: [PATCH 4/8] Update rebranding of DevTools What's New tab
---
libre/iceweasel/libre.patch | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 3dbc2cad0..adb1e8256 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -178,6 +178,15 @@ index 0a31843..c01e488 100644
linkText: "Read more",
linkUrl:
`https://developer.mozilla.org/docs/Mozilla/Firefox/Releases/72?${utmParams}`,
features: [
+@@ -39,7 +39,7 @@ const release = {
+ href:
`https://wiki.developer.mozilla.org/docs/Tools/Debugger/How_to/Set_a_watchpoint_on_a_property?${utmParams}`,
+ },
+ {
+- header: `Improvements to VS Code’s Debugger for Firefox`,
++ header: `Improvements to VS Code’s Debugger for Iceweasel`,
+ description: `A new source map integration makes debugging faster and
also integrates with VSCode’s new column breakpoints UI for fine-grained
control. The new Watchpoints can be used via VSCode’s Data Points.`,
+ href:
`https://marketplace.visualstudio.com/items?itemName=firefox-devtools.vscode-firefox-debug`,
+ },
@@ -66,29 +66,6 @@ const release = {
],
};
--
2.25.0
From 726a8587539a52f30d767b4ea64e87c996c7bca1 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 23:02:49 +0200
Subject: [PATCH 5/8] Change search placeholder in about:addons
Mentioned in https://labs.parabola.nu/issues/2488#note-7
---
libre/iceweasel/libre.patch | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index adb1e8256..96852f0ae 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -301,5 +301,14 @@ index edd871b..77870fe 100644
- .placeholder = Search addons.mozilla.org
+ .placeholder = Search www.parabola.nu/packages
.searchbuttonlabel = Search
-
+
search-header-shortcut =
+@@ -482,7 +482,7 @@ theme-heading-search-label = Find more themes
+ extension-heading-search-label = Find more extensions
+ default-heading-search-label = Find more add-ons
+ addons-heading-search-input =
+- .placeholder = Search addons.mozilla.org
++ .placeholder = Search www.parabola.nu/packages
+
+ addon-page-options-button =
+ .title = Tools for all add-ons
--
2.25.0
From 2ea16440279914e6dbaa7c0a5ec0a3ab05d50de9 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 23:04:31 +0200
Subject: [PATCH 6/8] Rebrand wordmark in new tab in Private Browsing mode
---
libre/iceweasel/libre.patch | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/libre/iceweasel/libre.patch b/libre/iceweasel/libre.patch
index 96852f0ae..b3f745241 100644
--- a/libre/iceweasel/libre.patch
+++ b/libre/iceweasel/libre.patch
@@ -312,3 +312,16 @@ index edd871b..77870fe 100644
addon-page-options-button =
.title = Tools for all add-ons
+diff --git a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
+index 2d1aca3..dcb1afd 100644
+--- a/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
++++ b/browser/themes/shared/privatebrowsing/aboutPrivateBrowsing.css
+@@ -63,7 +63,7 @@ p {
+ }
+
+ .wordmark {
+- background:
url("resource://activity-stream/data/content/assets/firefox-wordmark.svg")
no-repeat center center;
++ background: url("chrome://branding/content/about-wordmark.svg") no-repeat
center center;
+ background-size: 172px;
+ -moz-context-properties: fill;
+ display: inline-block;
--
2.25.0
From 1b3942fbf57197849daf5b71f38893d6ddbde57d Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 23:04:55 +0200
Subject: [PATCH 7/8] Disable 'What's New' gift icon in toolbar and main menu.
---
libre/iceweasel/vendor.js.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libre/iceweasel/vendor.js.in b/libre/iceweasel/vendor.js.in
index f530b75e2..505495fd7 100644
--- a/libre/iceweasel/vendor.js.in
+++ b/libre/iceweasel/vendor.js.in
@@ -315,3 +315,7 @@ pref("extensions.getAddons.search.browseURL",
"https://www.parabola.nu/packages/
// Make extensions work on Mozilla domains
pref("extensions.webextensions.restrictedDomains", "");
+
+// Disable 'What's New' gift icon in toolbar and main menu.
+// It shows downloaded news that sometimes contain links to non-free software
like mobile Firefox.
+pref("browser.messaging-system.whatsNewPanel.enabled", false);
--
2.25.0
From 86d3e6bb4473104fa3ef5a09b21597031dfdf338 Mon Sep 17 00:00:00 2001
From: grizzlyuser <grizzlyu...@protonmail.com>
Date: Tue, 28 Jan 2020 22:52:34 +0200
Subject: [PATCH 8/8] updpkgsums and minor fixes
i686 builds with gcc not clang, no need to remove debug flags for it.
---
libre/iceweasel/PKGBUILD | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index bce5754e0..1077f5936 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -41,7 +41,7 @@
# privacy:
# - Remove Google API keys and usage
# - Disable Mozilla telemetry and crash reporting (good manners
-# because of all of the other patching we're doing
+# because of all of the other patching we're doing)
#
# [1]: https://www.mozilla.org/en-US/foundation/trademarks/policy/
@@ -84,15 +84,15 @@
source_i686=('rust-static-disable-network-test-on-static-libraries.patch'
'avoid-libxul-OOM-python-check.patch')
source_armv7h=('arm.patch'
'build-arm-libopus.patch')
-sha256sums=('1fa59aedc8469c3e6ffb12449ab7de2f93776f7679eedebfb74aa309b694956f'
+sha256sums=('77fd224bea885172d757aef587ad443f2171aa84e4297bca55df91a1951be389'
'SKIP'
'5f7ac724a5c5afd9322b1e59006f4170ea5354ca1e0e60dab08b7784c2d8463c'
'f573d00835afe066ef1887bfea35099933ee07aeadc4c0d603972127e600cfc4'
'e90956067d8549f02864d612369ed8714d7173f0ee07bbfb4374a7323b4a733e'
'SKIP'
- '1169ccda88642881e0ba024f0c82fce9ac3064d3587517f9960e88cae479ce3e'
+ '7a252ee65236e8056fd063d826112be63210aada00427c8933655b8115efc2fc'
'dfed11d97f1d4198a3dc608be159b6b53a11054f376cdb73bb0fe9a487ae9418'
- '4979e733215492372c196cdb93ec61eac1fbbd44f44e637dbd420040c8d9affe')
+ '42cabd0f82c2d2078119e060aab4174665b08fbf8095e238ddd1372ffaeef267')
sha256sums_i686=('4da71f6614dce71db8e9ec2d317514aae90838c2c65620d435f0df06b45b578b'
'5a3e038a57c4576dcb88766d41cbfda5ad109d5cfe41d2000f7ba25563bf00f2')
sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
@@ -292,9 +292,11 @@ build() {
CXXFLAGS="${CXXFLAGS/-fno-plt/}"
fi
- # DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments'
- CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
- CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"
+ if [[ $CARCH != i686 ]]; then
+ # DEBUG: clang-9: error: unknown argument: '-fvar-tracking-assignments'
+ CFLAGS="${CFLAGS/-fvar-tracking-assignments/}"
+ CXXFLAGS="${CXXFLAGS/-fvar-tracking-assignments/}"
+ fi
## [ARCH-SPECIFIC CONFIG] ##
case ${CARCH} in
--
2.25.0
_______________________________________________
Dev mailing list
Dev@lists.parabola.nu
https://lists.parabola.nu/mailman/listinfo/dev
