From: "Philip Oakley" <philipoak...@iee.org>
The i18n 5e9637c (i18n: add infrastructure for translating
Git with gettext, 2011-11-18) introduced an extra '-o' option
into the make file, which broke engine.pl code for extracting
the git.sln for msvc gui-IDE.
Add tests to remove these non linker options, in same vein as
74cf9bd (engine.pl: Fix a recent breakage of the buildsystem
generator, 2010-01-22).
It now looks like this resolution is in the wrong direction. The
correct right solution is to include
NO_GETTEXT = YesPlease
into the _Windows_ section of the Makefile.
Mysgit uses the _MinGW_ section, and fixed the NO_GETTEXT requirement,
so the breakage in the Windows section build wasn't noticed.
However, the test is still useful for adding a detection step and
providing a warning to users
NO_GETTEXT = YesPlease
Signed-off-by: Philip Oakley <philipoak...@iee.org>
---
contrib/buildsystems/engine.pl | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/contrib/buildsystems/engine.pl
b/contrib/buildsystems/engine.pl
index 23da787..f48c28a 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -140,6 +140,12 @@ sub parseMakeOutput
next;
}
+ if ($text =~ /^(mkdir|msgfmt) /) {
+ # options to the Portable Object translations
+ # the line "mkdir ... && msgfmt ..." contains no linker
options
+ next;
+ }
+
if($text =~ / -c /) {
# compilation
handleCompileLine($text, $line);
--
There are still more issues to be resolved e.g.
test-svn-fe.obj : error LNK2001: unresolved external symbol _strtoull
etc.
Philip
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
