From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 369F4138CEA for ; Sun, 14 Jun 2015 21:02:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0E0EFE08C5; Sun, 14 Jun 2015 21:02:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8034FE08B2 for ; Sun, 14 Jun 2015 21:02:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E3BD8340D00 for ; Sun, 14 Jun 2015 21:02:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 94456A23 for ; Sun, 14 Jun 2015 21:01:59 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1434315811.7639bead240dd9125eae47c9f35a3e7269603c76.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-musl/ X-VCS-Repository: proj/releng X-VCS-Files: tools-musl/run-armv7a.sh tools-musl/run-mips32r2.sh tools-musl/run-mipsel3.sh tools-musl/run-ppc.sh tools-musl/run.sh tools-musl/stage-all.conf.template X-VCS-Directories: tools-musl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7639bead240dd9125eae47c9f35a3e7269603c76 X-VCS-Branch: master Date: Sun, 14 Jun 2015 21:01:59 +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-Archives-Salt: 3d233f2f-42f9-4229-bd78-b79358e97372 X-Archives-Hash: 5020c9a81f990d1f253c30a9efe3317d commit: 7639bead240dd9125eae47c9f35a3e7269603c76 Author: Anthony G. Basile gentoo org> AuthorDate: Sun Jun 14 21:03:31 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Sun Jun 14 21:03:31 2015 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7639bead tools-musl: fix when portage_confdir is missing. tools-musl/run-armv7a.sh | 4 ++++ tools-musl/run-mips32r2.sh | 5 +++++ tools-musl/run-mipsel3.sh | 5 +++++ tools-musl/run-ppc.sh | 5 +++++ tools-musl/run.sh | 5 +++++ tools-musl/stage-all.conf.template | 2 +- 6 files changed, 25 insertions(+), 1 deletion(-) diff --git a/tools-musl/run-armv7a.sh b/tools-musl/run-armv7a.sh index f2ff4a0..6892f2f 100755 --- a/tools-musl/run-armv7a.sh +++ b/tools-musl/run-armv7a.sh @@ -38,6 +38,10 @@ prepare_confs() { echo "cflags: -O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard" >> \ stage${s}-${arch}-musl-${flavor}.conf + portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \ + | sed -e 's/^.*://') + [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \ + stage${s}-${arch}-musl-${flavor}.conf done sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf diff --git a/tools-musl/run-mips32r2.sh b/tools-musl/run-mips32r2.sh index 07d5778..0818361 100755 --- a/tools-musl/run-mips32r2.sh +++ b/tools-musl/run-mips32r2.sh @@ -27,6 +27,11 @@ prepare_confs() { -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ > stage${s}-${arch}-musl-${flavor}.conf + + portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \ + | sed -e 's/^.*://') + [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \ + stage${s}-${arch}-musl-${flavor}.conf done sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf diff --git a/tools-musl/run-mipsel3.sh b/tools-musl/run-mipsel3.sh index 50e5d57..51c6753 100755 --- a/tools-musl/run-mipsel3.sh +++ b/tools-musl/run-mipsel3.sh @@ -27,6 +27,11 @@ prepare_confs() { -e "s|^cflags:.*|cflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ -e "s|^cxxflags:.*|cxxflags: -O2 -march=mips3 -mplt -Wa,-mfix-loongson2f-nop -pipe|" \ > stage${s}-${arch}-musl-${flavor}.conf + + portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \ + | sed -e 's/^.*://') + [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \ + stage${s}-${arch}-musl-${flavor}.conf done sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf diff --git a/tools-musl/run-ppc.sh b/tools-musl/run-ppc.sh index 4294391..bb51672 100755 --- a/tools-musl/run-ppc.sh +++ b/tools-musl/run-ppc.sh @@ -27,6 +27,11 @@ prepare_confs() { -e "s:FLAVOR:${flavor}:g" \ -e "s:MYCATALYST:$(pwd):g" \ > stage${s}-${arch}-musl-${flavor}.conf + + portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \ + | sed -e 's/^.*://') + [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \ + stage${s}-${arch}-musl-${flavor}.conf done sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf diff --git a/tools-musl/run.sh b/tools-musl/run.sh index 7f82a8e..17d883b 100755 --- a/tools-musl/run.sh +++ b/tools-musl/run.sh @@ -29,6 +29,11 @@ prepare_confs() { -e "s:FLAVOR:${flavor}:g" \ -e "s:MYCATALYST:$(pwd):g" \ > stage${s}-${arch}-musl-${flavor}.conf + + portage_confdir=$(grep portage_confdir stage${s}-${arch}-musl-${flavor}.conf \ + | sed -e 's/^.*://') + [[ ! -e ${portage_confdir} ]] && sed -i -e '/^portage_confdir/d' \ + stage${s}-${arch}-musl-${flavor}.conf done sed -i "/^chost/d" stage3-${arch}-musl-${flavor}.conf diff --git a/tools-musl/stage-all.conf.template b/tools-musl/stage-all.conf.template index d7dab4b..942b02b 100644 --- a/tools-musl/stage-all.conf.template +++ b/tools-musl/stage-all.conf.template @@ -9,4 +9,4 @@ chost: TARCH-gentoo-linux-musl cflags: -O2 -pipe -fomit-frame-pointer cxxflags: -O2 -pipe -fomit-frame-pointer portage_confdir: MYCATALYST/portage.SARCH.FLAVOR -portage_overlay: /var/lib/layman/hardened-development-musl +portage_overlay: /var/lib/layman/musl