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 9F299138334 for ; Thu, 10 Jan 2019 08:20:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3BD54E09AD; Thu, 10 Jan 2019 08:20:20 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0FFC8E09AD for ; Thu, 10 Jan 2019 08:20:18 +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 24DE1335CBD for ; Thu, 10 Jan 2019 08:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 491AB4FB for ; Thu, 10 Jan 2019 08:20:06 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1547108363.845833bbd940f60434c682562d516c5ace24c3e0.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/bootstrap-prefix.sh X-VCS-Directories: scripts/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 845833bbd940f60434c682562d516c5ace24c3e0 X-VCS-Branch: master Date: Thu, 10 Jan 2019 08:20:06 +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: 903198d9-a8c1-43a3-aa6f-b226518d3070 X-Archives-Hash: 5143da92bb0a2a3bb99cef42e20a8ecc commit: 845833bbd940f60434c682562d516c5ace24c3e0 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 10 07:27:05 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 10 08:19:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=845833bb scripts/bootstrap-prefix: propagate *FLAGS to target too Signed-off-by: Fabian Groffen gentoo.org> scripts/bootstrap-prefix.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 9ce12729e3..cced408b42 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -1454,10 +1454,11 @@ do_emerge_pkgs() { done myuse=( ${myuse} ) - # Portage seems to ignore USE= for build dependencies. Since - # that's what we're more or less doing all the time, encode the - # USE-flags in profiles/use.mask and profiles/use.force which - # normally do not exist. + # Portage seems to ignore USE=, *FLAGS for target dependencies. + # Since that's what we're more or less doing all the time, + # encode the USE-flags in profiles/use.mask and + # profiles/use.force which normally do not exist. Get LDFLAGS + # set through make.conf. rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force} for use in "${myuse[@]}" ; do case "${use}" in @@ -1469,6 +1470,12 @@ do_emerge_pkgs() { ;; esac done + sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf + { + echo "CFLAGS=\"\${CFLAGS} ${OVERRIDE_CFLAGS}\" #stage3_temp#" + echo "CXXFLAGS=\"\${CXXFLAGS} ${OVERRIDE_CXXFLAGS}\" #stage3_temp#" + echo "LDFLAGS=\"\${LDFLAGS} ${LDFLAGS}\" #stage3_temp#" + } >> "${EPREFIX}"/tmp/etc/portage/make.conf # Disable the STALE warning because the snapshot frequently gets stale. # @@ -1491,6 +1498,7 @@ do_emerge_pkgs() { ) [[ $? -eq 0 ]] || return 1 rm -f "${EPREFIX}"/usr/portage/profiles/use.{mask,force} + sed -i -e '/#stage3_temp#/d' "${EPREFIX}"/tmp/etc/portage/make.conf case ${pkg},${CHOST} in app-shells/bash,*-cygwin*)