From ebb43eae990509a069666e3cdbaef76e17e48523 Mon Sep 17 00:00:00 2001 From: q66 Date: Wed, 21 Aug 2019 16:35:22 +0200 Subject: [PATCH] firefox: preliminary 32-bit ppc fixes The xptcall code needs to be fixed for this to build and work. This for now adds some preliminary changes to allow the rest of it to build. --- srcpkgs/firefox/template | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template index c8d2881252..fc873a70ea 100644 --- a/srcpkgs/firefox/template +++ b/srcpkgs/firefox/template @@ -16,7 +16,7 @@ checksum=78304cd58229e7103b56b34718aad051c9a4db30c266512a64f501ba58da7fbe lib32disabled=yes hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo - llvm clang nodejs cbindgen python nasm" + llvm clang nodejs-lts-10 cbindgen python nasm" makedepends="nss-devel libjpeg-turbo-devel gtk+-devel gtk+3-devel icu-devel pixman-devel sqlite-devel libevent-devel libnotify-devel libvpx5-devel libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std @@ -36,7 +36,10 @@ case $XBPS_TARGET_MACHINE in broken="required NEON extensions are not supported on armv6" ;; ppc64*) ;; - ppc*) broken="ftbfs in several places" ;; + ppc*) + makedepends+=" libatomic-devel" + broken="xptcall bitrot" + ;; esac # we need this because cargo verifies checksums of all files in vendor @@ -83,6 +86,16 @@ do_build() { ;; esac + # webrtc currently fails to build on 32-bit ppc... + # also need explicit libatomic + case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*) + echo "ac_add_options --disable-webrtc" >>.mozconfig + export LDFLAGS+=" -latomic" + ;; + esac + if [ "$CROSS_BUILD" ]; then BINDGEN_INCLUDE_FLAGS=$( $CPP -x c++ -v /dev/null -o /dev/null 2>&1 | \ sed -n '/#include <...> search starts here:/,/End of search list./p' | \