From 20f73acc9e5a949ed1a364d2fd69786313d1456e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
Date: Thu, 13 Sep 2018 10:51:02 +0000
Subject: [PATCH] community/chromium: fix armhf triplet
This and the few previous commits together fixes #5701
---
community/chromium/APKBUILD | 2 +-
community/chromium/chromium-use-alpine-target.patch | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD
index 0b26a584f68b..792f52401302 100644
--- a/community/chromium/APKBUILD
+++ b/community/chromium/APKBUILD
@@ -363,7 +363,7 @@ db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f
6b0812725a0fc562527f3556dc4979fec72d1ba92f26a5e78ff2016c39bb2c155a0ff95fc22101f9c097d14b84182d6615276f4247f60ae7833ab45da8366e6d swiftshader.patch
de2d6ebc75d0496a9424ea6c025b052d6d59f38477338b0e2a5c21ccec11e774244fd5d340195c523f7a3c02ccfd8ac81486958008bc8b221c848dfa2c71bd50 secure_getenv.patch
38670c9bdc87b3779593eab141ac23741fa47c774ba491f273239a453566979583e352b032caf350ed485bbc006addca0f689b8c439646c2d37e28e3f3ea476c chromium-clang-r2.patch
-4887b3169aeda13871a67658b993c6a92656113f1dc7be5643db97031559dd3841a4a8b612c2a11e14cb649eda799b25393b7ad82692297b9dd19cef26213425 chromium-use-alpine-target.patch
+246c43a0ab557671119ebc4ecb292925ebfee25312fb50e739a179dc085d23b9623bec2d7baecdd37ebd9318f8770664f20c12de6383def74cd89b7845d149ce chromium-use-alpine-target.patch
838892a2873145f96659aade410c0b48a03b6e95bdfc3ed5bb88868792caca327ae6843020a4ca209693445831a4a0ad1b0e4f195851b60812a129aa7ff2bf7c chromium-remove-unknown-clang-warnings.patch
6e2bcbed44786c6c0d3beda935269f30fdcdf07c400defa6bf73f8359a60b1d59cc2f80dbc106be651a535635995641321d9e524b18919d3975bd6008a641d59 chromium-gcc-r1.patch
cbd99d51178fa5c2c3dee1eb4990240ca2ff829cee9151384e36bc3c634698c0ecaf9b51c99e901f38d0a37eef7187fe5ad39b9b7f528f7a9066a855a0c6e49f chromium-skia-harmony.patch
diff --git a/community/chromium/chromium-use-alpine-target.patch b/community/chromium/chromium-use-alpine-target.patch
index 37ede77852e5..467bf46b4113 100644
--- a/community/chromium/chromium-use-alpine-target.patch
+++ b/community/chromium/chromium-use-alpine-target.patch
@@ -6,8 +6,8 @@
if (is_clang && !is_android && !is_nacl) {
- cflags += [ "--target=arm-linux-gnueabihf" ]
- ldflags += [ "--target=arm-linux-gnueabihf" ]
-+ cflags += [ "--target=armv6-alpine-linux-muslgnueabihf" ]
-+ ldflags += [ "--target=armv6-alpine-linux-muslgnueabihf" ]
++ cflags += [ "--target=armv6-alpine-linux-musleabihf" ]
++ ldflags += [ "--target=armv6-alpine-linux-musleabihf" ]
}
if (!is_nacl) {
cflags += [
--
GitLab