CVS commit: pkgsrc/x11/qt5-qtbase

["Dr. Thomas Orgis" <thor%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   thor
Date:           Fri Jun 18 02:21:32 UTC 2021

Modified Files:
        pkgsrc/x11/qt5-qtbase: distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-mkspecs_common_gcc-base.conf

Log Message:
x11/qt5-qtbase: build fix for older gcc -march=native

See https://bugreports.qt.io/browse/QTBUG-71564 . This replaces -march=core-avx2
with -mavx2 for the respective bits of the code, to avoid interaction
with global -march=naitive in not freshest GCC. Otherwise, the build would
fail in that setup.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_common_gcc-base.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.63 pkgsrc/x11/qt5-qtbase/distinfo:1.64
--- pkgsrc/x11/qt5-qtbase/distinfo:1.63 Tue Nov 24 09:35:18 2020
+++ pkgsrc/x11/qt5-qtbase/distinfo      Fri Jun 18 02:21:32 2021
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.63 2020/11/24 09:35:18 tsutsui Exp $
+$NetBSD: distinfo,v 1.64 2021/06/18 02:21:32 thor Exp $
 
 SHA1 (qtbase-everywhere-src-5.15.2.tar.xz) = b5ad67fc6381ad7fae0296944734198488d096a3
 RMD160 (qtbase-everywhere-src-5.15.2.tar.xz) = ee53f1b7dadc0b96a2f79fe7f54467b46894b12b
 SHA512 (qtbase-everywhere-src-5.15.2.tar.xz) = a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
 Size (qtbase-everywhere-src-5.15.2.tar.xz) = 50179672 bytes
 SHA1 (patch-configure) = f5019131cc4e6cd4e35242cc7b598fbf8f5f766b
+SHA1 (patch-mkspecs_common_gcc-base.conf) = 7b461079adff516ac3957d0cdb127dee67dab7ce
 SHA1 (patch-mkspecs_features_qt__module.prf) = a04c4b1fe80250b6b3591f5486ac0fd3b5056c26
 SHA1 (patch-mkspecs_features_toolchain.prf) = 0cf13cb6e859dd6276954239b91953e557add515
 SHA1 (patch-qmake_Makefile.unix) = 8a55d0eb30903266ce529bbfa562b492cdd359b3

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_common_gcc-base.conf
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_common_gcc-base.conf:1.1
--- /dev/null   Fri Jun 18 02:21:32 2021
+++ pkgsrc/x11/qt5-qtbase/patches/patch-mkspecs_common_gcc-base.conf    Fri Jun 18 02:21:32 2021
@@ -0,0 +1,18 @@
+$NetBSD: patch-mkspecs_common_gcc-base.conf,v 1.1 2021/06/18 02:21:32 thor Exp $
+
+Do not break -march=native builds with certain gcc versions. See
+https://bugreports.qt.io/browse/QTBUG-71564 for detail and upstream
+unwillingness.
+
+--- ./mkspecs/common/gcc-base.conf.orig        2019-06-13 13:36:03.554816463 +0000
++++ ./mkspecs/common/gcc-base.conf
+@@ -109,7 +109,8 @@ QMAKE_CFLAGS_MIPS_DSP  += -mdsp
+ QMAKE_CFLAGS_MIPS_DSPR2 += -mdspr2
+ 
+ # -march=haswell is supported as of GCC 4.9 and Clang 3.6
+-QMAKE_CFLAGS_ARCH_HASWELL           = -march=core-avx2
++# https://bugreports.qt.io/browse/QTBUG-71564
++QMAKE_CFLAGS_ARCH_HASWELL           = -mavx2
+ 
+ # Wrapper tools that understand .o/.a files with GIMPLE instead of machine code
+ QMAKE_AR_LTCG           = gcc-ar cqs