qt5-webengine: fix cross
-L<cross_path> leaks somewhere into host build steps, so just strip it at the link wrapper
This commit is contained in:
parent
e5ff2bd87c
commit
b3eac0a398
2 changed files with 24 additions and 4 deletions
20
srcpkgs/qt5-webengine/patches/cross-insanity.patch
Normal file
20
srcpkgs/qt5-webengine/patches/cross-insanity.patch
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/src/3rdparty/chromium/build/toolchain/gcc_link_wrapper.py 2021-02-23 16:36:59.000000000 +0100
|
||||||
|
+++ b/src/3rdparty/chromium/build/toolchain/gcc_link_wrapper.py 2021-03-09 22:21:08.066565706 +0100
|
||||||
|
@@ -54,10 +54,16 @@
|
||||||
|
help='Linking command')
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
+ command = []
|
||||||
|
+ if(args.command[0] == "/usr/lib/ccache/bin/g++"):
|
||||||
|
+ command = [e for e in args.command if not e.startswith("-L")]
|
||||||
|
+ else:
|
||||||
|
+ command = args.command
|
||||||
|
+
|
||||||
|
# Work-around for gold being slow-by-default. http://crbug.com/632230
|
||||||
|
fast_env = dict(os.environ)
|
||||||
|
fast_env['LC_ALL'] = 'C'
|
||||||
|
- result = wrapper_utils.RunLinkWithOptionalMapFile(args.command, env=fast_env,
|
||||||
|
+ result = wrapper_utils.RunLinkWithOptionalMapFile(command, env=fast_env,
|
||||||
|
map_file=args.map_file)
|
||||||
|
if result != 0:
|
||||||
|
return result
|
|
@ -1,6 +1,3 @@
|
||||||
nocross="https://build.voidlinux.org/builders/aarch64-musl_builder/builds/32273/steps/shell_3/logs/stdio"
|
|
||||||
# using /usr/bin/ld but target libraries
|
|
||||||
|
|
||||||
# Template file for 'qt5-webengine'
|
# Template file for 'qt5-webengine'
|
||||||
pkgname=qt5-webengine
|
pkgname=qt5-webengine
|
||||||
version=5.15.3
|
version=5.15.3
|
||||||
|
@ -18,7 +15,9 @@ configure_args="--
|
||||||
$(vopt_if pipewire '' '-no')-webengine-webrtc-pipewire"
|
$(vopt_if pipewire '' '-no')-webengine-webrtc-pipewire"
|
||||||
# Rely on auto detection (fails if forced for cross builds) -webengine-alsa
|
# Rely on auto detection (fails if forced for cross builds) -webengine-alsa
|
||||||
hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config nodejs
|
hostmakedepends="qt5-qmake gperf ninja qt5-host-tools flex pkg-config nodejs
|
||||||
which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel"
|
which perl python protobuf nss-devel libevent-devel zlib-devel icu-devel
|
||||||
|
libjpeg-turbo-devel libpng-devel libwebp-devel freetype-devel
|
||||||
|
harfbuzz-devel"
|
||||||
makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
|
makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
|
||||||
qt5-declarative-devel libevent-devel snappy-devel icu-devel ffmpeg-devel
|
qt5-declarative-devel libevent-devel snappy-devel icu-devel ffmpeg-devel
|
||||||
libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
|
libwebp-devel opus-devel cups-devel nss-devel minizip-devel libxslt-devel
|
||||||
|
@ -36,6 +35,7 @@ checksum="8e86257d25a641939d50c14de2049b384c371fcb70a60a289dc5426be0423b40
|
||||||
ee97e569529a60729e3c6b7317011fd2cc40600079e90c4afa2e5ea9edcd58ef"
|
ee97e569529a60729e3c6b7317011fd2cc40600079e90c4afa2e5ea9edcd58ef"
|
||||||
patch_args="-Np1"
|
patch_args="-Np1"
|
||||||
|
|
||||||
|
no_generic_pkgconfig_link=yes
|
||||||
build_options="sndio pipewire"
|
build_options="sndio pipewire"
|
||||||
build_options_default="pipewire"
|
build_options_default="pipewire"
|
||||||
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
|
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue