1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix version script generation when cross-compiling from Windows to QNX

Browse Source 
Recent versions of Qt have apparently added sufficient numbers of
headers that the command lines used to spawn a custom header-
parsing tool, started overflowing Windows' maximum command-line
length.

This change restructures the mechanism to use a GCC-style command-
line arguments file rather than passing filenames all directly
in the argv[] vector.

Although QNX is the usual ELF target whose cross-build is supported
on Windows, the mechanics introduced in this patch happen to affect
all other ELF Unix systems' builds too.

Change-Id: I5a7383cf9f2ebf9dffde8dbfdcdeca888265e085
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Matt Hoosier 2015-12-02 14:02:02 -06:00
parent a206583da1
commit 6f1b78c980
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mkspecs/features/data/unix/findclasslist.pl
View File

@ -33,8 +33,21 @@
############################################################################# #############################################################################
use strict; use strict;
my $syntax = "findclasslist.pl [private header list]\n" . my $syntax = "findclasslist.pl <file (containing private header list)>\n" .
"Replaces \@CLASSLIST\@ with the classes found in the header files\n"; "Replaces \@CLASSLIST\@ with the classes found in the header files\n";
die("Expected exactly one argument") if (@ARGV != 1);
my @headers = ();
# Expand contents of the command-line arguments file
open ARGFILE, "<$ARGV[0]" or die("Could not open arguments file $ARGV[0]: $!");
while (my $line = <ARGFILE>) {
chomp($line);
push @headers, $line;
}
close ARGFILE;
$\ = $/; $\ = $/;
while (<STDIN>) { while (<STDIN>) {
chomp; chomp;
@ -44,7 +57,7 @@ while (<STDIN>) {
} }
# Replace @CLASSLIST@ with the class list # Replace @CLASSLIST@ with the class list
for my $header (@ARGV) { for my $header (@headers) {
open HDR, "<$header" or die("Could not open header $header: $!"); open HDR, "<$header" or die("Could not open header $header: $!");
my $comment = " /* $header */"; my $comment = " /* $header */";
while (my $line = <HDR>) { while (my $line = <HDR>) {

5
mkspecs/features/qt_module.prf
View File

@ -215,11 +215,12 @@ android: CONFIG += qt_android_deps no_linker_version_script
} }
# Add a post-processing step to replace the @CLASSLIST@ # Add a post-processing step to replace the @CLASSLIST@
verscriptprocess.commands = perl $${PWD}/data/unix/findclasslist.pl < $^ > $@ verscriptprocess.commands = perl $${PWD}/data/unix/findclasslist.pl < $${verscript}.in $${verscript}.in.args > $@
verscriptprocess.target = $$verscript verscriptprocess.target = $$verscript
verscriptprocess.depends = $${verscript}.in
for(header, SYNCQT.PRIVATE_HEADER_FILES): \ for(header, SYNCQT.PRIVATE_HEADER_FILES): \
verscriptprocess.depends += $${_PRO_FILE_PWD_}/$$header verscriptprocess.depends += $${_PRO_FILE_PWD_}/$$header
write_file($${verscript}.in.args, verscriptprocess.depends)|error("Aborting.")
verscriptprocess.depends += $${verscript}.in $${verscript}.in.args
QMAKE_EXTRA_TARGETS += verscriptprocess QMAKE_EXTRA_TARGETS += verscriptprocess
PRE_TARGETDEPS += $$verscript PRE_TARGETDEPS += $$verscript
verscript = $${verscript}.in verscript = $${verscript}.in