icecat: fix cross build

This commit is contained in:
Jürgen Buchmüller 2020-10-29 12:19:41 +01:00
parent 46d1b05567
commit 18cf0c9693
2 changed files with 23 additions and 5 deletions

View file

@ -0,0 +1,16 @@
terrible hack to fix cross builds
overwrite HOST_* flags to get rid of -MF
note: this patch was used from firefox-77 until 80, dropped with the update to 81
--- third_party/rust/glslopt/build.rs
+++ third_party/rust/glslopt/build.rs
@@ -28,6 +28,8 @@
env::remove_var(format!("CXXFLAGS_{}", &target));
env::remove_var(format!("CFLAGS_{}", target.replace("-", "_")));
env::remove_var(format!("CXXFLAGS_{}", target.replace("-", "_")));
+ env::set_var("HOST_CFLAGS", "-O2");
+ env::set_var("HOST_CXXFLAGS", "-O2");
configure(&mut cc::Build::new())
.warnings(false)

View file

@ -20,8 +20,7 @@ homepage="https://www.gnu.org/software/${pkgname}/"
distfiles="https://distfiles.voidlinux.de/${pkgname}-${version}/${pkgname}-${version}-gnu1.tar.xz"
checksum=739b304170f99ea0edda3c92eab17f55c764811b470dc6a262f3c9eaa717d062
lib32disabled=yes
nocross="warning: src/compiler/glsl/glcpp/glcpp-lex.l:622:1: fatal error: opening dependency file .deps/forc
e-cargo-library-build.pp: No such file or directory"
#nocross="warning: src/compiler/glsl/glcpp/glcpp-lex.l:622:1: fatal error: opening dependency file .deps/forc e-cargo-library-build.pp: No such file or directory"
build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland"
build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland"
@ -56,8 +55,9 @@ _clear_vendor_checksums() {
# FIXME: The *.xpi files have to be signed to be accepted as plugins
# yet how do you sign a package if you don't have a signing key?
_install_langpack() {
local lang=$1 tempdir=$(ls -d ${wrksrc}/obj-${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}/dist/linux-*)
vinstall ${tempdir}/xpi/${sourcepkg}-${version}.${lang}.langpack.xpi \
local lang=$1
local tempdir="$(ls -d ${wrksrc}/obj-*/dist/linux-*/xpi|head -n1)"
vinstall "${tempdir}"/${sourcepkg}-${version}.${lang}.langpack.xpi \
644 usr/lib/icecat/browser/extensions
}
@ -69,6 +69,7 @@ post_extract() {
post_patch() {
_clear_vendor_checksums num-traits
_clear_vendor_checksums glslopt
}
do_build() {
@ -174,7 +175,8 @@ EOF
./mach build
# Make langpacks for all languages
cd ${wrksrc}/obj-${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}/browser/locales/
dir=$(ls -d obj-*/browser/locales)
cd ${wrksrc}/${dir}
for lang in ${languages[*]}; do
msg_normal "Making langpack for ${lang} ...\n"
make ${makejobs} langpack-${lang} LOCALE_MERGEDIR=.