From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6BC80138334 for ; Sat, 8 Jun 2019 19:36:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E2B5E07B2; Sat, 8 Jun 2019 19:36:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 49DD0E07B2 for ; Sat, 8 Jun 2019 19:36:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 88867345A56 for ; Sat, 8 Jun 2019 19:36:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 383AF5BD for ; Sat, 8 Jun 2019 19:36:20 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1560022463.bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f X-VCS-Branch: master Date: Sat, 8 Jun 2019 19:36:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4929a76d-8d19-43ee-8b6c-650f4aaf1a2f X-Archives-Hash: 34e71648dbfa5ee568abe04cb93a0b5c commit: bd1dfde90f4b128ca3faa7c5a9295b244bf96d0f Author: Jimi Huotari gentoo org> AuthorDate: Sat Jun 8 19:26:46 2019 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Sat Jun 8 19:34:23 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=bd1dfde9 qt5-build.eclass: sync with the main Gentoo ebuild repo tree Use '|' sed delimiter instead of ':', which leads to a failure in 'src_prepare()' with 'CXXFLAGS=-falign-functions=32:25:1'. - https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21eb6a8e Bug: https://bugs.gentoo.org/685170 Signed-off-by: Jimi Huotari gentoo.org> eclass/qt5-build.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 434cb63c..0e169834 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -166,9 +166,9 @@ qt5-build_src_prepare() { -e '/echo "Done."/a fi' configure || die "sed failed (skip qmake bootstrap)" # Respect CC, CXX, *FLAGS, MAKEOPTS and EXTRA_EMAKE when bootstrapping qmake - sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s:): \ + sed -i -e "/outpath\/qmake\".*\"\$MAKE\")/ s|)| \ ${MAKEOPTS} ${EXTRA_EMAKE} 'CC=$(tc-getCC)' 'CXX=$(tc-getCXX)' \ - 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&:" \ + 'QMAKE_CFLAGS=${CFLAGS}' 'QMAKE_CXXFLAGS=${CXXFLAGS}' 'QMAKE_LFLAGS=${LDFLAGS}'&|" \ -e 's/\(setBootstrapVariable\s\+\|EXTRA_C\(XX\)\?FLAGS=.*\)QMAKE_C\(XX\)\?FLAGS_\(DEBUG\|RELEASE\).*/:/' \ configure || die "sed failed (respect env for qmake build)" sed -i -e '/^CPPFLAGS\s*=/ s/-g //' \