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 A428913888F for ; Sat, 31 Oct 2015 20:35:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26D1021C022; Sat, 31 Oct 2015 20:35:25 +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 AC73021C022 for ; Sat, 31 Oct 2015 20:35:24 +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 9D3F5340B25 for ; Sat, 31 Oct 2015 20:35:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A986C1C68 for ; Sat, 31 Oct 2015 20:35:19 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1446323200.b409bd9bb4b50f69a555e4e148057ade86a7ed16.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b409bd9bb4b50f69a555e4e148057ade86a7ed16 X-VCS-Branch: master Date: Sat, 31 Oct 2015 20:35:19 +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: 3c6b0d20-846b-44b8-bf3a-0109706505e9 X-Archives-Hash: 7efbcbd2156be8c983c68b5ca5da4494 commit: b409bd9bb4b50f69a555e4e148057ade86a7ed16 Author: Brian Dolbec gentoo org> AuthorDate: Sat Oct 31 20:26:40 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Oct 31 20:26:40 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b409bd9b stagebase.py: Refactor the *FLAGS handling code in chroot_setup() *FLAGS settings in spec files are loaded as a list. Although the config loading code has not changed in quite some time, the code was still treating these settings as strings. I don't know why the error was not triggered long ago. The code now handle catalyst/base/stagebase.py | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 0e4d8c2..5ba9cfc 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1055,36 +1055,24 @@ class StageBase(TargetBase, ClearBase, GenBase): myf=open(makepath, "w") myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n") - if "CFLAGS" in self.settings: - myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') - if "CXXFLAGS" in self.settings: - if self.settings["CXXFLAGS"]!=self.settings["CFLAGS"]: - myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - if "FCFLAGS" in self.settings: - if self.settings["FCFLAGS"]!=self.settings["CFLAGS"]: - myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n') - else: - myf.write('FCFLAGS="${CFLAGS}"\n') - else: - myf.write('FCFLAGS="${CFLAGS}"\n') - if "FFLAGS" in self.settings: - if self.settings["FFLAGS"]!=self.settings["CFLAGS"]: - myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n') + + for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS", + "ASFLAGS"]: + if not flags in self.settings: + continue + if flags in ["LDFLAGS", "ASFLAGS"]: + myf.write("# %s is unsupported. USE AT YOUR OWN RISK!\n" + % flags) + if (flags is not "CFLAGS" and + self.settings[flags] == self.settings["CFLAGS"]): + myf.write('%s="${CFLAGS}"\n' % flags) + elif isinstance(self.settings[flags], list): + myf.write('%s="%s"\n' + % (flags, ' '.join(self.settings[flags]))) else: - myf.write('FFLAGS="${CFLAGS}"\n') - else: - myf.write('FFLAGS="${CFLAGS}"\n') - - if "LDFLAGS" in self.settings: - myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n") - myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n') - if "ASFLAGS" in self.settings: - myf.write("# ASFLAGS is unsupported. USE AT YOUR OWN RISK!\n") - myf.write('ASFLAGS="'+self.settings["ASFLAGS"]+'"\n') + myf.write('%s="%s"\n' + % (flags, self.settings[flags])) + if "CBUILD" in self.settings: myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n") myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n') 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 98F791384B4 for ; Sat, 21 Nov 2015 01:34:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C85221C01C; Sat, 21 Nov 2015 01:33:51 +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 4AA3B21C00B for ; Sat, 21 Nov 2015 01:33:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 68939340AB6 for ; Sat, 21 Nov 2015 01:33:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 434401253 for ; Sat, 21 Nov 2015 01:33:45 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1446323200.b409bd9bb4b50f69a555e4e148057ade86a7ed16.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: b409bd9bb4b50f69a555e4e148057ade86a7ed16 X-VCS-Branch: pending Date: Sat, 21 Nov 2015 01:33:45 +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: d0330436-434b-4b81-be85-0e5f16d4fdbe X-Archives-Hash: abfd29a8a01872cc2719402ea1a357c3 Message-ID: <20151121013345.LA0-a9HcQJne7dCBpTaGy4GSr8UC9MZG4zLdOElRveQ@z> commit: b409bd9bb4b50f69a555e4e148057ade86a7ed16 Author: Brian Dolbec gentoo org> AuthorDate: Sat Oct 31 20:26:40 2015 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Oct 31 20:26:40 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=b409bd9b stagebase.py: Refactor the *FLAGS handling code in chroot_setup() *FLAGS settings in spec files are loaded as a list. Although the config loading code has not changed in quite some time, the code was still treating these settings as strings. I don't know why the error was not triggered long ago. The code now handle catalyst/base/stagebase.py | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 0e4d8c2..5ba9cfc 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -1055,36 +1055,24 @@ class StageBase(TargetBase, ClearBase, GenBase): myf=open(makepath, "w") myf.write("# These settings were set by the catalyst build script that automatically\n# built this stage.\n") myf.write("# Please consult /usr/share/portage/config/make.conf.example for a more\n# detailed example.\n") - if "CFLAGS" in self.settings: - myf.write('CFLAGS="'+self.settings["CFLAGS"]+'"\n') - if "CXXFLAGS" in self.settings: - if self.settings["CXXFLAGS"]!=self.settings["CFLAGS"]: - myf.write('CXXFLAGS="'+self.settings["CXXFLAGS"]+'"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - else: - myf.write('CXXFLAGS="${CFLAGS}"\n') - if "FCFLAGS" in self.settings: - if self.settings["FCFLAGS"]!=self.settings["CFLAGS"]: - myf.write('FCFLAGS="'+self.settings["FCFLAGS"]+'"\n') - else: - myf.write('FCFLAGS="${CFLAGS}"\n') - else: - myf.write('FCFLAGS="${CFLAGS}"\n') - if "FFLAGS" in self.settings: - if self.settings["FFLAGS"]!=self.settings["CFLAGS"]: - myf.write('FFLAGS="'+self.settings["FFLAGS"]+'"\n') + + for flags in ["CFLAGS", "CXXFLAGS", "FCFLAGS", "FFLAGS", "LDFLAGS", + "ASFLAGS"]: + if not flags in self.settings: + continue + if flags in ["LDFLAGS", "ASFLAGS"]: + myf.write("# %s is unsupported. USE AT YOUR OWN RISK!\n" + % flags) + if (flags is not "CFLAGS" and + self.settings[flags] == self.settings["CFLAGS"]): + myf.write('%s="${CFLAGS}"\n' % flags) + elif isinstance(self.settings[flags], list): + myf.write('%s="%s"\n' + % (flags, ' '.join(self.settings[flags]))) else: - myf.write('FFLAGS="${CFLAGS}"\n') - else: - myf.write('FFLAGS="${CFLAGS}"\n') - - if "LDFLAGS" in self.settings: - myf.write("# LDFLAGS is unsupported. USE AT YOUR OWN RISK!\n") - myf.write('LDFLAGS="'+self.settings["LDFLAGS"]+'"\n') - if "ASFLAGS" in self.settings: - myf.write("# ASFLAGS is unsupported. USE AT YOUR OWN RISK!\n") - myf.write('ASFLAGS="'+self.settings["ASFLAGS"]+'"\n') + myf.write('%s="%s"\n' + % (flags, self.settings[flags])) + if "CBUILD" in self.settings: myf.write("# This should not be changed unless you know exactly what you are doing. You\n# should probably be using a different stage, instead.\n") myf.write('CBUILD="'+self.settings["CBUILD"]+'"\n')