tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Feelings about x11/qt5-qtbase build fix with -march=native?



I still have this patch lying around, which fixes qt5-qtbase builds
with a certain range of gcc versions that have bad interaction of
-march=native -march=somethingother.

Fine to commit during freeze?

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/x11/qt5-qtbase/distinfo,v
retrieving revision 1.63
diff -u -r1.63 distinfo
--- distinfo	24 Nov 2020 09:35:18 -0000	1.63
+++ distinfo	15 Jun 2021 16:14:48 -0000
@@ -5,6 +5,7 @@
 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
Index: patches/patch-mkspecs_common_gcc-base.conf
===================================================================
RCS file: patches/patch-mkspecs_common_gcc-base.conf
diff -N patches/patch-mkspecs_common_gcc-base.conf
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-mkspecs_common_gcc-base.conf	15 Jun 2021 16:14:48 -0000
@@ -0,0 +1,18 @@
+$NetBSD$
+
+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


-- 
Dr. Thomas Orgis
HPC @ Universität Hamburg


Home | Main Index | Thread Index | Old Index