From owner-svn-ports-all@freebsd.org Tue Apr 14 16:17:31 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AE8372C4157; Tue, 14 Apr 2020 16:17:31 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 491rHH3yCRz4Pw9; Tue, 14 Apr 2020 16:17:31 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7E7EB8146; Tue, 14 Apr 2020 16:17:31 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03EGHVDi095225; Tue, 14 Apr 2020 16:17:31 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03EGHV6s095224; Tue, 14 Apr 2020 16:17:31 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202004141617.03EGHV6s095224@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 14 Apr 2020 16:17:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531702 - head/devel/qt5/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/devel/qt5/files X-SVN-Commit-Revision: 531702 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Apr 2020 16:17:31 -0000 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