diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-07 10:42:21 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-17 16:59:11 +0200 |
| commit | 5298d9b77086a3bc9dd6ebb86e62506bbae0c05b (patch) | |
| tree | 7900050e0bee03ccdd0d0d86aeec0d9aabed16b1 | |
| parent | 86e8470f5db9adf3ae939629129979338e9c36f6 (diff) | |
| download | alpine_aports-5298d9b77086a3bc9dd6ebb86e62506bbae0c05b.tar.bz2 alpine_aports-5298d9b77086a3bc9dd6ebb86e62506bbae0c05b.tar.xz alpine_aports-5298d9b77086a3bc9dd6ebb86e62506bbae0c05b.zip | |
community/chromium: fix build on armv7
(cherry picked from commit 86e162b2b28e81a362c732e98078280ae94c4b72)
| -rw-r--r-- | community/chromium/APKBUILD | 4 | ||||
| -rw-r--r-- | community/chromium/chromium-use-alpine-target.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index d1b667d709..85c322d62d 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD | |||
| @@ -5,7 +5,7 @@ pkgver=77.0.3865.75 | |||
| 5 | pkgrel=0 | 5 | pkgrel=0 |
| 6 | pkgdesc="chromium web browser" | 6 | pkgdesc="chromium web browser" |
| 7 | url="http://www.chromium.org/" | 7 | url="http://www.chromium.org/" |
| 8 | arch="x86_64 aarch64" # disable armhf and armv7 til we sorted out clang++ | 8 | arch="x86_64 aarch64 armv7" |
| 9 | license="BSD" | 9 | license="BSD" |
| 10 | depends="xdg-utils" | 10 | depends="xdg-utils" |
| 11 | depends_dev="" | 11 | depends_dev="" |
| @@ -355,7 +355,7 @@ db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f | |||
| 355 | 81c590942e73a62027290684c56030796e4bb953dd5007db787733ba84a505326a65001267b820ac3f44212c7e903c102809961f8e4ad42c57e21c44ad41cfe6 resolver.patch | 355 | 81c590942e73a62027290684c56030796e4bb953dd5007db787733ba84a505326a65001267b820ac3f44212c7e903c102809961f8e4ad42c57e21c44ad41cfe6 resolver.patch |
| 356 | 84732900f50799ee8d4c9a572a8703c1cd67c6a3b8f8dcf97f308319dcef6ac3d41ea5ddfb2ef4d695bdebdae691e30d5631a8d04e59b931935ba188b0308a61 swiftshader.patch | 356 | 84732900f50799ee8d4c9a572a8703c1cd67c6a3b8f8dcf97f308319dcef6ac3d41ea5ddfb2ef4d695bdebdae691e30d5631a8d04e59b931935ba188b0308a61 swiftshader.patch |
| 357 | 7f9b816ff9088f84929dc9853ab8cf0c705ef95fedb9e9c3e85bc50c8befb76e39ecf5e754fa3fc8b34b42397875ec41c0729f880a642262b675ebf79901810a secure_getenv.patch | 357 | 7f9b816ff9088f84929dc9853ab8cf0c705ef95fedb9e9c3e85bc50c8befb76e39ecf5e754fa3fc8b34b42397875ec41c0729f880a642262b675ebf79901810a secure_getenv.patch |
| 358 | 246c43a0ab557671119ebc4ecb292925ebfee25312fb50e739a179dc085d23b9623bec2d7baecdd37ebd9318f8770664f20c12de6383def74cd89b7845d149ce chromium-use-alpine-target.patch | 358 | 50e2c78bc2e7f343ed97d348bbe34350439ede6a15bf8ea1017eb13c391d4718b00a51db9c2eb40d8398d9733bf1925db42011f3bcbdd7d83329b1c7d534032b chromium-use-alpine-target.patch |
| 359 | 589a7acf149d44db081da2dd24a7769f2b9572a8cc64d2aad78577a64768d3b6fb2bfa02292b5260acd2c4a28c3ae9b82847ff901ce8a21baeca0b46dcda0ca9 media-base.patch | 359 | 589a7acf149d44db081da2dd24a7769f2b9572a8cc64d2aad78577a64768d3b6fb2bfa02292b5260acd2c4a28c3ae9b82847ff901ce8a21baeca0b46dcda0ca9 media-base.patch |
| 360 | 05c1af43038f76014f5f8b605085310414242f2bfad0e3258ddb29a08e7f4307de31b2d551b0a291986cc7d5a01cf3a003ac864216877195bb4310fd33193f0f musl-crashpad.patch | 360 | 05c1af43038f76014f5f8b605085310414242f2bfad0e3258ddb29a08e7f4307de31b2d551b0a291986cc7d5a01cf3a003ac864216877195bb4310fd33193f0f musl-crashpad.patch |
| 361 | 6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116 musl-v8-monotonic-pthread-cont_timedwait.patch | 361 | 6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116 musl-v8-monotonic-pthread-cont_timedwait.patch |
diff --git a/community/chromium/chromium-use-alpine-target.patch b/community/chromium/chromium-use-alpine-target.patch index 467bf46b41..769ea7ad77 100644 --- a/community/chromium/chromium-use-alpine-target.patch +++ b/community/chromium/chromium-use-alpine-target.patch | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | if (is_clang && !is_android && !is_nacl) { | 6 | if (is_clang && !is_android && !is_nacl) { |
| 7 | - cflags += [ "--target=arm-linux-gnueabihf" ] | 7 | - cflags += [ "--target=arm-linux-gnueabihf" ] |
| 8 | - ldflags += [ "--target=arm-linux-gnueabihf" ] | 8 | - ldflags += [ "--target=arm-linux-gnueabihf" ] |
| 9 | + cflags += [ "--target=armv6-alpine-linux-musleabihf" ] | 9 | + cflags += [ "--target=armv7-alpine-linux-musleabihf" ] |
| 10 | + ldflags += [ "--target=armv6-alpine-linux-musleabihf" ] | 10 | + ldflags += [ "--target=armv7-alpine-linux-musleabihf" ] |
| 11 | } | 11 | } |
| 12 | if (!is_nacl) { | 12 | if (!is_nacl) { |
| 13 | cflags += [ | 13 | cflags += [ |