diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-06-24 16:01:42 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2019-10-03 19:49:48 +0000 |
commit | f9635567942071206f10430024895db6a127abf8 (patch) | |
tree | ba9aa7254cbe6faf6079a26c3cb4347826fd11d8 /gnuwin32/patches | |
parent | accc0af6e4a66c598409c5ed22ba1e8f63fc96ae (diff) |
Remove gnuwin32 - it is provided through provisioning
Having a few windows specific tools in qt5.git was always strange. We
now provision the utilities to the machines, so remove them from
qt5.git.
[ChangeLog][General] GnuWin32 is no longer part of the Qt source code repositories.
Instead it can be downloaded from the upstream project at https://gnuwin32.sourceforge.net .
For convenience we also make a copy available here:
https://download.qt.io/development_releases/gnuwin32/gnuwin32.zip
The GnuWin32 tools are needed for building Qt from source on Windows.
Binary package downloads are not affected.
Task-number: QTBUG-73424
Change-Id: I9212cc2923343f4f84bcba9d1444a90e446dfb8a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'gnuwin32/patches')
-rw-r--r-- | gnuwin32/patches/win_flex.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/gnuwin32/patches/win_flex.patch b/gnuwin32/patches/win_flex.patch deleted file mode 100644 index 27d1e936..00000000 --- a/gnuwin32/patches/win_flex.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: flex/src/main.c -=================================================================== ---- flex/src/main.c (revision 24) -+++ flex/src/main.c (working copy) -@@ -112,7 +112,7 @@ - struct yytbl_writer tableswr; - - int prev_stdout = 0; --char *flex_temp_out_main="~flex_temp_out_main"; -+char *flex_temp_out_main = 0; - - /* Make sure program_name is initialized so we don't crash if writing - * out an error message before getting the program name from argv[0]. -@@ -767,6 +767,8 @@ - tblsiz); - } - -+ free (flex_temp_out_main); -+ flex_temp_out_main = 0; - exit (exit_status); - } - -@@ -779,8 +781,10 @@ - { - int i, sawcmpflag, rv, optind; - char *arg; -+ char flex_temp_out_main_template[] = "~flex_temp_out_main_XXXXXX"; - scanopt_t sopt; - -+ flex_temp_out_main = _strdup(_mktemp(flex_temp_out_main_template)); - printstats = syntaxerror = trace = spprdflt = false; - lex_compat = posix_compat = C_plus_plus = backing_up_report = - ddebug = fulltbl = false; -Index: flex/src/filter.c -=================================================================== ---- flex/src/filter.c (revision 24) -+++ flex/src/filter.c (working copy) -@@ -86,7 +86,8 @@ - - /* Get some more or less random data. */ - { -- static unsigned long long g_value = 827363; -+ static unsigned long long g_value; -+ g_value = _getpid(); - g_value += 100; - random_time_bits = (((unsigned long long)234546 << 32) - | (unsigned long long)g_value); |