[PATCH] build: fix typo in buildversion.py
Fixes the following build error: Building ld scripts Traceback (most recent call last): File "./scripts/buildversion.py", line 134, in <module> main() File "./scripts/buildversion.py", line 114, in main cleanbuild, toolstr = tool_versions(options.tools) File "./scripts/buildversion.py", line 90, in tool_versions vers[isbinutils] = "mixed" NameError: global name 'vers' is not defined Makefile:160: recipe for target 'out/romlayout16.lds' failed Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- Cc: Kevin O'Connor <kevin@koconnor.net> --- scripts/buildversion.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/buildversion.py b/scripts/buildversion.py index ad47b90..4692898 100755 --- a/scripts/buildversion.py +++ b/scripts/buildversion.py @@ -87,7 +87,7 @@ def tool_versions(tools): if versions[isbinutils] and versions[isbinutils] != ver: logging.debug("Mixed version %s vs %s" % ( repr(versions[isbinutils]), repr(ver))) - vers[isbinutils] = "mixed" + versions[isbinutils] = "mixed" continue versions[isbinutils] = ver success += 1 -- 1.9.5 (Apple Git-50.3)
On Mon, Dec 28, 2015 at 01:50:41PM +0100, Roger Pau Monne wrote:
Fixes the following build error:
Building ld scripts Traceback (most recent call last): File "./scripts/buildversion.py", line 134, in <module> main() File "./scripts/buildversion.py", line 114, in main cleanbuild, toolstr = tool_versions(options.tools) File "./scripts/buildversion.py", line 90, in tool_versions vers[isbinutils] = "mixed" NameError: global name 'vers' is not defined Makefile:160: recipe for target 'out/romlayout16.lds' failed
Thanks - I applied this patch. BTW, does your build environment indeed have a mix of binutils versions? -Kevin
El 28/12/15 a les 18.17, Kevin O'Connor ha escrit:
On Mon, Dec 28, 2015 at 01:50:41PM +0100, Roger Pau Monne wrote:
Fixes the following build error:
Building ld scripts Traceback (most recent call last): File "./scripts/buildversion.py", line 134, in <module> main() File "./scripts/buildversion.py", line 114, in main cleanbuild, toolstr = tool_versions(options.tools) File "./scripts/buildversion.py", line 90, in tool_versions vers[isbinutils] = "mixed" NameError: global name 'vers' is not defined Makefile:160: recipe for target 'out/romlayout16.lds' failed
Thanks - I applied this patch.
BTW, does your build environment indeed have a mix of binutils versions?
It looks like, this is from compiling SeaBIOS on FreeBSD with: $ gmake HOSTCC=gcc48 CC=gcc48 LD32BIT_FLAG=-melf_i386_fbsd Building ld scripts DEBUG:root:Running 'gcc48 --version' DEBUG:root:Got (code=0): 'gcc48 (FreeBSD Ports Collection) 4.8.5\nCopyright (C) 2015 Free Software Foundation, Inc.\nThis is free software; see the source for copying conditions. There is NO\nwarranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n' DEBUG:root:Running 'as --version' DEBUG:root:Got (code=0): "GNU assembler 2.17.50 [FreeBSD] 2007-07-03\nCopyright 2007 Free Software Foundation, Inc.\nThis program is free software; you may redistribute it under the terms of\nthe GNU General Public License. This program has absolutely no warranty.\nThis assembler was configured for a target of `x86_64-unknown-freebsd'.\n" DEBUG:root:Running 'ld --version' DEBUG:root:Got (code=0): 'GNU ld 2.17.50 [FreeBSD] 2007-07-03\nCopyright 2007 Free Software Foundation, Inc.\nThis program is free software; you may redistribute it under the terms of\nthe GNU General Public License. This program has absolutely no warranty.\n' DEBUG:root:Running 'objcopy --version' DEBUG:root:Got (code=0): 'GNU objcopy 2.17.50 [FreeBSD] 2007-07-03\nCopyright 2007 Free Software Foundation, Inc.\nThis program is free software; you may redistribute it under the terms of\nthe GNU General Public License. This program has absolutely no warranty.\n' DEBUG:root:Running 'objdump --version' DEBUG:root:Got (code=0): 'GNU objdump 2.17.50 [FreeBSD] 2007-07-03\nCopyright 2007 Free Software Foundation, Inc.\nThis program is free software; you may redistribute it under the terms of\nthe GNU General Public License. This program has absolutely no warranty.\n' DEBUG:root:Running 'strip --version' DEBUG:root:Got (code=0): 'strip (elftoolchain r3223M)\n' DEBUG:root:Mixed version u'(FreeBSD Ports Collection) 4.8.5' vs u'(elftoolchain r3223M)' DEBUG:root:Running 'git describe --tags --long --dirty' DEBUG:root:Got (code=0): 'rel-1.9.0-0-g01a84be-dirty\n' DEBUG:root:Got git version: u'rel-1.9.0-0-g01a84be-dirty' DEBUG:root:Write file u'rel-1.9.0-0-g01a84be-dirty-20151228_201338-nuc' and u'gcc: mixed binutils: 2.17.50 [FreeBSD] 2007-07-03' Version: rel-1.9.0-0-g01a84be-dirty-20151228_201338-nuc AFAICT gcc is obviously from the ports collection, while strip is from the base system. Roger.
participants (3)
-
Kevin O'Connor -
Roger Pau Monne -
Roger Pau Monné