* Re: [PR PATCH] [Updated] [TESTING] firefox: fix build for armv7hf-musl
2019-10-28 5:35 [PR PATCH] firefox: fix build for armv7hf-musl voidlinux-github
@ 2019-10-28 5:36 ` voidlinux-github
2019-10-28 5:36 ` voidlinux-github
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: voidlinux-github @ 2019-10-28 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages firefox
https://github.com/void-linux/void-packages/pull/15847
[TESTING] firefox: fix build for armv7hf-musl
A patch file from https://github.com/void-linux/void-packages/pull/15847.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-15847.patch --]
[-- Type: text/x-diff, Size: 2665 bytes --]
From 531a0e9908a41c3b82468b9625c5ac00ae8305fd Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 12:28:31 +0700
Subject: [PATCH] firefox: fix build for armv7hf-musl
[skip ci]
---
.../firefox/patches/musl-rust.configure.patch | 26 +++++++++++++++++++
srcpkgs/firefox/template | 3 +--
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/firefox/patches/musl-rust.configure.patch
diff --git a/srcpkgs/firefox/patches/musl-rust.configure.patch b/srcpkgs/firefox/patches/musl-rust.configure.patch
new file mode 100644
index 00000000000..d8f387136e0
--- /dev/null
+++ b/srcpkgs/firefox/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
+@@ -297,11 +297,20 @@
+ suffix = 'hf'
+ else:
+ suffix = ''
++
++ narrowed = []
+ for p in prefixes:
+ for c in candidates:
+- if c.rust_target.startswith('{}-'.format(p)) and \
+- c.rust_target.endswith(suffix):
+- return c.rust_target
++ if c.rust_target.startswith('{}-'.format(p)):
++ narrowed.append(c.rust_target)
++
++ for target in narrowed:
++ if target.endswith(host_or_target.raw_os):
++ return target
++
++ for target in narrowed:
++ if target.endswith(suffix):
++ return target
+
+ # See if we can narrow down on the exact alias
+ narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 4b6112bb392..e9d8c72d0e4 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
#
pkgname=firefox
version=70.0
-revision=1
+revision=2
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
@@ -32,7 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
case $XBPS_TARGET_MACHINE in
- armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21533/steps/shell_3/logs/stdio" ;;
armv6*)
broken="required NEON extensions are not supported on armv6"
;;
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] [TESTING] firefox: fix build for armv7hf-musl
2019-10-28 5:35 [PR PATCH] firefox: fix build for armv7hf-musl voidlinux-github
2019-10-28 5:36 ` [PR PATCH] [Updated] [TESTING] " voidlinux-github
@ 2019-10-28 5:36 ` voidlinux-github
2019-10-28 20:01 ` voidlinux-github
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: voidlinux-github @ 2019-10-28 5:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages firefox
https://github.com/void-linux/void-packages/pull/15847
[TESTING] firefox: fix build for armv7hf-musl
A patch file from https://github.com/void-linux/void-packages/pull/15847.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-15847.patch --]
[-- Type: text/x-diff, Size: 2665 bytes --]
From 531a0e9908a41c3b82468b9625c5ac00ae8305fd Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 12:28:31 +0700
Subject: [PATCH] firefox: fix build for armv7hf-musl
[skip ci]
---
.../firefox/patches/musl-rust.configure.patch | 26 +++++++++++++++++++
srcpkgs/firefox/template | 3 +--
2 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/firefox/patches/musl-rust.configure.patch
diff --git a/srcpkgs/firefox/patches/musl-rust.configure.patch b/srcpkgs/firefox/patches/musl-rust.configure.patch
new file mode 100644
index 00000000000..d8f387136e0
--- /dev/null
+++ b/srcpkgs/firefox/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
+@@ -297,11 +297,20 @@
+ suffix = 'hf'
+ else:
+ suffix = ''
++
++ narrowed = []
+ for p in prefixes:
+ for c in candidates:
+- if c.rust_target.startswith('{}-'.format(p)) and \
+- c.rust_target.endswith(suffix):
+- return c.rust_target
++ if c.rust_target.startswith('{}-'.format(p)):
++ narrowed.append(c.rust_target)
++
++ for target in narrowed:
++ if target.endswith(host_or_target.raw_os):
++ return target
++
++ for target in narrowed:
++ if target.endswith(suffix):
++ return target
+
+ # See if we can narrow down on the exact alias
+ narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 4b6112bb392..e9d8c72d0e4 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
#
pkgname=firefox
version=70.0
-revision=1
+revision=2
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
@@ -32,7 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
case $XBPS_TARGET_MACHINE in
- armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21533/steps/shell_3/logs/stdio" ;;
armv6*)
broken="required NEON extensions are not supported on armv6"
;;
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [TESTING] firefox: fix build for armv7hf-musl
2019-10-28 5:35 [PR PATCH] firefox: fix build for armv7hf-musl voidlinux-github
2019-10-28 5:36 ` [PR PATCH] [Updated] [TESTING] " voidlinux-github
2019-10-28 5:36 ` voidlinux-github
@ 2019-10-28 20:01 ` voidlinux-github
2019-10-29 0:16 ` [PR PATCH] [Updated] " voidlinux-github
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: voidlinux-github @ 2019-10-28 20:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by jnbr on void-packages repository
https://github.com/void-linux/void-packages/pull/15847#issuecomment-547120920
Comment:
Thank you for the fix.
There is no need to change the revision in this case, as the patch doesn't affect any packages that are built already.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] [TESTING] firefox: fix build for armv7hf-musl
2019-10-28 5:35 [PR PATCH] firefox: fix build for armv7hf-musl voidlinux-github
` (2 preceding siblings ...)
2019-10-28 20:01 ` voidlinux-github
@ 2019-10-29 0:16 ` voidlinux-github
2019-10-29 0:16 ` voidlinux-github
2019-10-29 5:32 ` [PR PATCH] [Merged]: " voidlinux-github
5 siblings, 0 replies; 7+ messages in thread
From: voidlinux-github @ 2019-10-29 0:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages firefox
https://github.com/void-linux/void-packages/pull/15847
[TESTING] firefox: fix build for armv7hf-musl
Built for:
- [x] armv7hf-musl
- [ ] armv7hf
- [ ] x86_64
- [x] x86_64-musl
- [x] i686
- [ ] aarch64
- [ ] aarch64-musl
Tested with:
- [ ] x86_64
- [ ] x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/15847.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-15847.patch --]
[-- Type: text/x-diff, Size: 2470 bytes --]
From dfd9d965582c99b1daf8e890483eb7b53edba968 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 12:28:31 +0700
Subject: [PATCH] firefox: fix build for armv7hf-musl
[skip ci]
---
.../firefox/patches/musl-rust.configure.patch | 26 +++++++++++++++++++
srcpkgs/firefox/template | 1 -
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/firefox/patches/musl-rust.configure.patch
diff --git a/srcpkgs/firefox/patches/musl-rust.configure.patch b/srcpkgs/firefox/patches/musl-rust.configure.patch
new file mode 100644
index 00000000000..d8f387136e0
--- /dev/null
+++ b/srcpkgs/firefox/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
+@@ -297,11 +297,20 @@
+ suffix = 'hf'
+ else:
+ suffix = ''
++
++ narrowed = []
+ for p in prefixes:
+ for c in candidates:
+- if c.rust_target.startswith('{}-'.format(p)) and \
+- c.rust_target.endswith(suffix):
+- return c.rust_target
++ if c.rust_target.startswith('{}-'.format(p)):
++ narrowed.append(c.rust_target)
++
++ for target in narrowed:
++ if target.endswith(host_or_target.raw_os):
++ return target
++
++ for target in narrowed:
++ if target.endswith(suffix):
++ return target
+
+ # See if we can narrow down on the exact alias
+ narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 4b6112bb392..fecce28d997 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,7 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
case $XBPS_TARGET_MACHINE in
- armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21533/steps/shell_3/logs/stdio" ;;
armv6*)
broken="required NEON extensions are not supported on armv6"
;;
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Updated] [TESTING] firefox: fix build for armv7hf-musl
2019-10-28 5:35 [PR PATCH] firefox: fix build for armv7hf-musl voidlinux-github
` (3 preceding siblings ...)
2019-10-29 0:16 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-10-29 0:16 ` voidlinux-github
2019-10-29 5:32 ` [PR PATCH] [Merged]: " voidlinux-github
5 siblings, 0 replies; 7+ messages in thread
From: voidlinux-github @ 2019-10-29 0:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 505 bytes --]
There is an updated pull request by zdtcd against master on the void-packages repository
https://github.com/zdtcd/void-packages firefox
https://github.com/void-linux/void-packages/pull/15847
[TESTING] firefox: fix build for armv7hf-musl
Built for:
- [x] armv7hf-musl
- [ ] armv7hf
- [ ] x86_64
- [x] x86_64-musl
- [x] i686
- [ ] aarch64
- [ ] aarch64-musl
Tested with:
- [ ] x86_64
- [ ] x86_64-musl
A patch file from https://github.com/void-linux/void-packages/pull/15847.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-firefox-15847.patch --]
[-- Type: text/x-diff, Size: 2470 bytes --]
From dfd9d965582c99b1daf8e890483eb7b53edba968 Mon Sep 17 00:00:00 2001
From: Doan Tran Cong Danh <congdanhqx@gmail.com>
Date: Mon, 28 Oct 2019 12:28:31 +0700
Subject: [PATCH] firefox: fix build for armv7hf-musl
[skip ci]
---
.../firefox/patches/musl-rust.configure.patch | 26 +++++++++++++++++++
srcpkgs/firefox/template | 1 -
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/firefox/patches/musl-rust.configure.patch
diff --git a/srcpkgs/firefox/patches/musl-rust.configure.patch b/srcpkgs/firefox/patches/musl-rust.configure.patch
new file mode 100644
index 00000000000..d8f387136e0
--- /dev/null
+++ b/srcpkgs/firefox/patches/musl-rust.configure.patch
@@ -0,0 +1,26 @@
+--- build/moz.configure/rust.configure 2019-10-28 12:05:04.930404603 +0700
++++ build/moz.configure/rust.configure 2019-10-28 12:09:42.742338957 +0700
+@@ -297,11 +297,20 @@
+ suffix = 'hf'
+ else:
+ suffix = ''
++
++ narrowed = []
+ for p in prefixes:
+ for c in candidates:
+- if c.rust_target.startswith('{}-'.format(p)) and \
+- c.rust_target.endswith(suffix):
+- return c.rust_target
++ if c.rust_target.startswith('{}-'.format(p)):
++ narrowed.append(c.rust_target)
++
++ for target in narrowed:
++ if target.endswith(host_or_target.raw_os):
++ return target
++
++ for target in narrowed:
++ if target.endswith(suffix):
++ return target
+
+ # See if we can narrow down on the exact alias
+ narrowed = [c for c in candidates if c.target.alias == host_or_target.alias]
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 4b6112bb392..fecce28d997 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -32,7 +32,6 @@ build_options="alsa dbus pulseaudio startup_notification xscreensaver sndio wayl
build_options_default="alsa dbus pulseaudio startup_notification xscreensaver sndio wayland"
case $XBPS_TARGET_MACHINE in
- armv7l-musl) broken="https://build.voidlinux.org/builders/armv7l-musl_builder/builds/21533/steps/shell_3/logs/stdio" ;;
armv6*)
broken="required NEON extensions are not supported on armv6"
;;
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PR PATCH] [Merged]: [TESTING] firefox: fix build for armv7hf-musl
2019-10-28 5:35 [PR PATCH] firefox: fix build for armv7hf-musl voidlinux-github
` (4 preceding siblings ...)
2019-10-29 0:16 ` voidlinux-github
@ 2019-10-29 5:32 ` voidlinux-github
5 siblings, 0 replies; 7+ messages in thread
From: voidlinux-github @ 2019-10-29 5:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
There's a merged pull request on the void-packages repository
[TESTING] firefox: fix build for armv7hf-musl
https://github.com/void-linux/void-packages/pull/15847
Description:
Built for:
- [x] armv7hf-musl
- [ ] armv7hf
- [x] x86_64
- [x] x86_64-musl
- [x] i686
- [ ] aarch64
- [ ] aarch64-musl
Tested with:
- [x] x86_64
- [x] x86_64-musl
^ permalink raw reply [flat|nested] 7+ messages in thread