svn commit: r531702 - head/devel/qt5/files

[Piotr Kubaj]

Author: pkubaj
Date: Tue Apr 14 16:17:30 2020
New Revision: 531702
URL: https://svnweb.freebsd.org/changeset/ports/531702

Log:
  devel/qt5: adjust extra patch used with base GCC
  
  This allows devel/qt5-qmake to build on powerpc64 12.1-RELEASE.

Modified:
  head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf

Modified: head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf
==============================================================================
--- head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf	Tue Apr 14 16:03:24 2020	(r531701)
+++ head/devel/qt5/files/extra-patch-mkspecs_common_g++-base.conf	Tue Apr 14 16:17:30 2020	(r531702)
@@ -1,5 +1,5 @@
---- mkspecs/common/g++-base.conf.orig	2018-09-21 12:02:35 UTC
-+++ mkspecs/common/g++-base.conf
+--- mkspecs/common/g++-base.conf.orig	2020-03-27 10:49:31.000000000 +0100
++++ mkspecs/common/g++-base.conf	2020-04-14 18:03:20.866157000 +0200
 @@ -8,14 +8,14 @@
  # you can use the manual test in tests/manual/mkspecs.
  #
@@ -7,14 +7,14 @@
 -QMAKE_COMPILER          = gcc
 +QMAKE_COMPILER          = gcc%%GCC_DEFAULT%%
  
--QMAKE_CC                = gcc
-+QMAKE_CC                = gcc%%GCC_DEFAULT%%
+-QMAKE_CC                = $${CROSS_COMPILE}gcc
++QMAKE_CC                = $${CROSS_COMPILE}gcc%%GCC_DEFAULT%%
  
  QMAKE_LINK_C            = $$QMAKE_CC
  QMAKE_LINK_C_SHLIB      = $$QMAKE_CC
  
--QMAKE_CXX               = g++
-+QMAKE_CXX               = g++%%GCC_DEFAULT%%
+-QMAKE_CXX               = $${CROSS_COMPILE}g++
++QMAKE_CXX               = $${CROSS_COMPILE}g++%%GCC_DEFAULT%%
  
  QMAKE_LINK              = $$QMAKE_CXX
  QMAKE_LINK_SHLIB        = $$QMAKE_CXX