From bbb533a6867f2a60698b478c9d573594c213f8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Wed, 5 Aug 2020 19:36:54 +0200 Subject: [PATCH] qt5-webkit: fix mips* --- srcpkgs/qt5-webkit/patches/mips-isa-rev.patch | 16 ++++++++++++++++ srcpkgs/qt5-webkit/template | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/qt5-webkit/patches/mips-isa-rev.patch diff --git a/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch b/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch new file mode 100644 index 0000000000..78d03b9d3e --- /dev/null +++ b/srcpkgs/qt5-webkit/patches/mips-isa-rev.patch @@ -0,0 +1,16 @@ +--- Source/WTF/wtf/Platform.h 2020-04-14 00:51:51.000000000 +0200 ++++ Source/WTF/wtf/Platform.h 2020-08-02 15:08:02.169747050 +0200 +@@ -95,7 +95,12 @@ + #define WTF_MIPS_PIC (defined __PIC__) + #define WTF_MIPS_ISA(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH == v) + #define WTF_MIPS_ISA_AT_LEAST(v) (defined WTF_MIPS_ARCH && WTF_MIPS_ARCH >= v) +-#define WTF_MIPS_ARCH_REV __mips_isa_rev ++#ifdef __mips_isa_rev ++#define WTF_MIPS_ARCH_REV __mips_isa_rev ++#else ++/* The compiler hasn't defined the isa rev so assume it's MIPS I - V (0) */ ++#define WTF_MIPS_ARCH_REV 0 ++#endif + #define WTF_MIPS_ISA_REV(v) (defined WTF_MIPS_ARCH_REV && WTF_MIPS_ARCH_REV == v) + #define WTF_MIPS_DOUBLE_FLOAT (defined __mips_hard_float && !defined __mips_single_float) + #define WTF_MIPS_FP64 (defined __mips_fpr && __mips_fpr == 64) diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template index 03abdc4115..742de47c6a 100644 --- a/srcpkgs/qt5-webkit/template +++ b/srcpkgs/qt5-webkit/template @@ -36,7 +36,7 @@ fi # only a few platform support JIT case "$XBPS_TARGET_MACHINE" in - armv[67]*|aarch64*|i686*|x86_64*|mips*) ;; + armv[67]*|aarch64*|i686*|x86_64*) ;; *) configure_args+=" -DENABLE_JIT=OFF" ;; esac @@ -64,7 +64,7 @@ pre_configure() { # the above is not enough for 32-bit ppc and debug case "$XBPS_TARGET_MACHINE" in ppc64*) ;; - ppc*) + mips*|ppc*) export CFLAGS="${CFLAGS/-O2/-Os}" export CXXFLAGS="${CXXFLAGS/-O2/-Os}" ;;