electron24: use gn package instead of bundled version

This commit is contained in:
Duncaen 2025-07-17 22:36:49 +02:00
parent 0d99f54fbc
commit 34ec66b608
No known key found for this signature in database
GPG key ID: 335C1D17EC3D6E35

View file

@ -12,7 +12,7 @@ hostmakedepends="$(vopt_if clang "clang lld") pkgconf perl gperf bison ninja nod
pciutils-devel ffmpeg-devel libxml2-devel libglib-devel yarn openjdk8 libxslt-devel
opus-devel libXcursor-devel libXcomposite-devel libXtst-devel libXrandr-devel libXScrnSaver-devel
alsa-lib-devel re2-devel snappy-devel mit-krb5-devel $(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel) jq python3.11"
$(vopt_if sndio sndio-devel) jq python3.11 gn"
makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel
libXi-devel libgcrypt-devel libsecret-devel cups-devel elfutils-devel
libXcomposite-devel speech-dispatcher-devel libXrandr-devel mit-krb5-devel
@ -224,12 +224,14 @@ pre_configure() {
rm -f third_party/devtools-frontend/src/third_party/esbuild/esbuild
# compile gn early, so it can be used to generate gni stuff
msg_normal "Bootstrapping GN\n"
CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" \
CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \
LDFLAGS="${XBPS_LDFLAGS}" \
python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
if false; then
msg_normal "Bootstrapping GN\n"
CC="${CC_FOR_BUILD:-$CC}" CXX="${CXX_FOR_BUILD:-$CXX}" LD="${LD_FOR_BUILD:-$LD}" \
CFLAGS="${CFLAGS_FOR_BUILD:-$CFLAGS}" \
CXXFLAGS="${CXXFLAGS_FOR_BUILD:-$CXXFLAGS} -Wno-error=redundant-move" \
LDFLAGS="${XBPS_LDFLAGS}" \
python3.11 tools/gn/bootstrap/bootstrap.py -s -v --skip-generate-buildfiles
fi
# we need to generate ppc64 stuff for libvpx as it's not shipped
# this has to be done before unbundling, but after gn is built
@ -400,7 +402,11 @@ do_configure() {
)
msg_normal "Configuring build\n"
out/Release/gn gen out/$_buildtype --args="${conf[*]}"
if false; then
out/Release/gn gen out/$_buildtype --args="${conf[*]}"
else
gn gen out/$_buildtype --args="${conf[*]}"
fi
}
do_build() {