Mercurial > mxe-octave
annotate src/gdb-1-gnulib.patch @ 5732:055dec6c319b
Allow other packages to use newer Windows API functions.
* src/mingw-w64.mk, src/build-gcc.mk: Since we now require version 6.1 or newer
of the Windows API (Windows 7 or newer) for Octave 7, allow other packages to
use these functions, too, by setting a default Windows API version.
* src/gdb-1-gnulib.patch: Cherrypick patch from upstream to fix compiling for
newer Windows API.
* dist-files.mk: Add new patch to list.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Sun, 11 Apr 2021 12:39:19 +0200 |
parents | |
children |
rev | line source |
---|---|
5732
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 From 361cb219351d8b7e39e1962fe77f40aa80657b27 Mon Sep 17 00:00:00 2001 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 From: Andrew Burgess <andrew.burgess@embecosm.com> |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 Date: Tue, 6 Oct 2020 10:09:06 +0100 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 Subject: [PATCH] gnulib: Ensure all libraries are used when building |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 gdb/gdbserver |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 An issue was reported here related to building GDB on MinGW: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 https://sourceware.org/pipermail/gdb/2020-September/048927.html |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 It was suggested here: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 https://sourceware.org/pipermail/gdb/2020-September/048931.html |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 that the solution might be to make use of $(LIB_GETRANDOM), a variable |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 defined in the gnulib makefile, when linking GDB. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 In fact I think the issue is bigger than just LIB_GETRANDOM. When |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 using the script binutils-gdb/gnulib/update-gnulib.sh to reimport |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 gnulib there is a lot of output from gnulib's gnulib-tool. Part of |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 that output is this: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 You may need to use the following makefile variables when linking. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 Use them in <program>_LDADD when linking a program, or |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 in <library>_a_LDFLAGS or <library>_la_LDFLAGS when linking a library. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 $(FREXPL_LIBM) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 $(FREXP_LIBM) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
28 $(INET_NTOP_LIB) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
29 $(LIBTHREAD) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
30 $(LIB_GETLOGIN) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
31 $(LIB_GETRANDOM) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
32 $(LIB_HARD_LOCALE) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
33 $(LIB_MBRTOWC) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
34 $(LIB_SETLOCALE_NULL) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
35 $(LTLIBINTL) when linking with libtool, $(LIBINTL) otherwise |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
36 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
37 What I think this is telling us is that we should be including the |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
38 value of all these variables on the link line for gdb and gdbserver. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
39 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
40 The problem though is that these variables are define in gnulib's |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
41 makefile, but are not (necessarily) defined in GDB's makefile. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
42 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
43 One solution would be to recreate the checks that gnulib performs in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
44 order to recreate these variables in both gdb's and gdbserver's |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
45 makefile. Though this shouldn't be too hard, most (if not all) of |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
46 these checks are in the form macros defined in m4 files in the gnulib |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
47 tree, so we could just reference these as needed. However, in this |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
48 commit I propose a different solution. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
49 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
50 Currently, in the top level makefile, we give gdb and gdbserver a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
51 dependency on gnulib. Once gnulib has finished building gdb and |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
52 gdbserver can start, these projects then have a hard coded (relative) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
53 path to the compiled gnulib library in their makefiles. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
54 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
55 In this commit I extend the gnulib configure script to install a new |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
56 makefile fragment in the gnulib build directory. This new file will |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
57 have the usual variable substitutions applied to it, and so can |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
58 include the complete list (see above) of all the extra libraries that |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
59 are needed when linking against gnulib. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
60 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
61 In fact the new makefile fragment defines three variables, these are: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
62 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
63 LIBGNU: The path to the archive containing gnulib. Can be used as a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
64 dependency as when this file changes gdb/gdbserver should be |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
65 relinked. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
66 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
67 LIBGNU_EXTRA_LIBS: A list of linker -l.... flags that should be |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
68 included in the link line of gdb/gdbserver. These are |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
69 libraries that $(LIBGNU) depends on. This list is taken from |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
70 the output of gnulib-tool, which is run by our |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
71 gnulib/update-gnulib.sh script. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
72 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
73 INCGNU: A list of -I.... include paths that should be passed to the |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
74 compiler, these are where the gnulib headers can be found. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
75 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
76 Now both gdb and gdbserver can include the makefile fragment and make |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
77 use of these variables. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
78 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
79 The makefile fragment relies on the variable GNULIB_BUILDDIR being |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
80 defined. This is checked for in the fragment, and was already defined |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
81 in the makefiles of gdb and gdbserver. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
82 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
83 gdb/ChangeLog: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
84 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
85 * Makefile.in: Include Makefile.gnulib.inc. Don't define LIBGNU |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
86 or INCGNU. Make use of LIBGNU_EXTRA_LIBS when linking. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
87 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
88 gdbserver/ChangeLog: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
89 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
90 * Makefile.in: Include Makefile.gnulib.inc. Don't define LIBGNU |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
91 or INCGNU. Make use of LIBGNU_EXTRA_LIBS when linking. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
92 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
93 gnulib/ChangeLog: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
94 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
95 * Makefile.gnulib.inc.in: New file. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
96 * Makefile.in: Regenerate. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
97 * configure: Regenerate. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
98 * configure.ac: Install the new file. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
99 --- |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
100 gdb/ChangeLog | 5 ++++ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
101 gdb/Makefile.in | 5 ++-- |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
102 gdbserver/ChangeLog | 5 ++++ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
103 gdbserver/Makefile.in | 11 ++++----- |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
104 gnulib/ChangeLog | 7 ++++++ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
105 gnulib/Makefile.gnulib.inc.in | 44 +++++++++++++++++++++++++++++++++++ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
106 gnulib/Makefile.in | 4 +++- |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
107 gnulib/configure | 4 ++++ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
108 gnulib/configure.ac | 2 ++ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
109 9 files changed, 77 insertions(+), 10 deletions(-) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
110 create mode 100644 gnulib/Makefile.gnulib.inc.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
111 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
112 diff --git a/gdb/Makefile.in b/gdb/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
113 index 80b788cdff9..5f92e8781e7 100644 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
114 --- a/gdb/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
115 +++ b/gdb/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
116 @@ -243,8 +243,7 @@ GDBFLAGS = |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
117 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
118 # Helper code from gnulib. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
119 GNULIB_BUILDDIR = ../gnulib |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
120 -LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
121 -INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
122 +include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
123 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
124 SUPPORT = ../gdbsupport |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
125 LIBSUPPORT = $(SUPPORT)/libgdbsupport.a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
126 @@ -632,7 +631,7 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(LIBCTF) $(BFD) $(ZLIB) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
127 $(XM_CLIBS) $(GDBTKLIBS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
128 @LIBS@ @GUILE_LIBS@ @PYTHON_LIBS@ \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
129 $(LIBEXPAT) $(LIBLZMA) $(LIBBABELTRACE) $(LIBIPT) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
130 - $(WIN32LIBS) $(LIBGNU) $(LIBICONV) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
131 + $(WIN32LIBS) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) $(LIBICONV) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
132 $(LIBMPFR) $(SRCHIGH_LIBS) $(LIBXXHASH) $(PTHREAD_LIBS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
133 $(DEBUGINFOD_LIBS) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
134 CDEPS = $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) $(CTF_DEPS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
135 diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
136 index c8cfed4819b..1969ed0ec37 100644 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
137 --- a/gdbserver/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
138 +++ b/gdbserver/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
139 @@ -114,8 +114,7 @@ ustinc = @ustinc@ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
140 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
141 # gnulib |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
142 GNULIB_BUILDDIR = ../gnulib |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
143 -LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
144 -INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
145 +include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
146 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
147 # Where is the INTL library? Typically in ../intl. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
148 INTL = @LIBINTL@ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
149 @@ -360,8 +359,8 @@ gdbserver$(EXEEXT): $(sort $(OBS)) ${CDEPS} $(LIBGNU) $(LIBIBERTY) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
150 $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
151 $(CXXFLAGS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
152 -o gdbserver$(EXEEXT) $(OBS) $(GDBSUPPORT) $(LIBGNU) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
153 - $(LIBIBERTY) $(INTL) $(GDBSERVER_LIBS) $(XM_CLIBS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
154 - $(WIN32APILIBS) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
155 + $(LIBGNU_EXTRA_LIBS) $(LIBIBERTY) $(INTL) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
156 + $(GDBSERVER_LIBS) $(XM_CLIBS) $(WIN32APILIBS) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
157 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
158 gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
159 $(INTL_DEPS) $(GDBSUPPORT) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
160 @@ -369,8 +368,8 @@ gdbreplay$(EXEEXT): $(sort $(GDBREPLAY_OBS)) $(LIBGNU) $(LIBIBERTY) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
161 $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_CFLAGS) $(INTERNAL_LDFLAGS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
162 $(CXXFLAGS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
163 -o gdbreplay$(EXEEXT) $(GDBREPLAY_OBS) $(XM_CLIBS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
164 - $(GDBSUPPORT) $(LIBGNU) $(LIBIBERTY) $(INTL) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
165 - $(WIN32APILIBS) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
166 + $(GDBSUPPORT) $(LIBGNU) $(LIBGNU_EXTRA_LIBS) \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
167 + $(LIBIBERTY) $(INTL) $(WIN32APILIBS) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
168 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
169 IPA_OBJS = \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
170 alloc-ipa.o \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
171 diff --git a/gnulib/Makefile.gnulib.inc.in b/gnulib/Makefile.gnulib.inc.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
172 new file mode 100644 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
173 index 00000000000..f3fd72b5781 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
174 --- /dev/null |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
175 +++ b/gnulib/Makefile.gnulib.inc.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
176 @@ -0,0 +1,44 @@ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
177 +# Copyright (C) 2020 Free Software Foundation, Inc. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
178 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
179 +# This program is free software; you can redistribute it and/or modify |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
180 +# it under the terms of the GNU General Public License as published by |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
181 +# the Free Software Foundation; either version 3 of the License, or |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
182 +# (at your option) any later version. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
183 +# |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
184 +# This program is distributed in the hope that it will be useful, |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
185 +# but WITHOUT ANY WARRANTY; without even the implied warranty of |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
186 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
187 +# GNU General Public License for more details. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
188 +# |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
189 +# You should have received a copy of the GNU General Public License |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
190 +# along with this program. If not, see <http://www.gnu.org/licenses/>. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
191 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
192 +# A makefile snippet that lists all of the libraries that should be |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
193 +# pulled in when linking against gnulib. Both GDB and GDBSERVER will |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
194 +# include this snippet. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
195 +# |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
196 +# The defined variables are: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
197 +# |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
198 +# LIBGNU: The path to the archive containing gnulib. Can be used as a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
199 +# dependency as when this file changes gdb/gdbserver should be |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
200 +# relinked. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
201 +# |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
202 +# LIBGNU_EXTRA_LIBS: A list of linker -l.... flags that should be |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
203 +# included in the link line of gdb/gdbserver. These are |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
204 +# libraries that $(LIBGNU) depends on. This list is taken from |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
205 +# the output of gnulib-tool, which is run by our |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
206 +# gnulib/update-gnulib.sh script. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
207 +# |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
208 +# INCGNU: A list of -I.... include paths that should be passed to the |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
209 +# compiler, these are where the gnulib headers can be found. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
210 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
211 +ifndef GNULIB_BUILDDIR |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
212 +$(error missing GNULIB_BUILDDIR) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
213 +endif |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
214 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
215 +LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
216 +LIBGNU_EXTRA_LIBS = @FREXPL_LIBM@ @FREXP_LIBM@ @INET_NTOP_LIB@ \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
217 + @LIBTHREAD@ @LIB_GETLOGIN@ @LIB_GETRANDOM@ \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
218 + @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
219 + @LIB_SETLOCALE_NULL@ @LIBINTL@ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
220 +INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
221 diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
222 index bdd3c3f3fbc..c1c21680944 100644 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
223 --- a/gnulib/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
224 +++ b/gnulib/Makefile.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
225 @@ -277,7 +277,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
226 configure.lineno config.status.lineno |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
227 mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
228 CONFIG_HEADER = config.h |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
229 -CONFIG_CLEAN_FILES = |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
230 +CONFIG_CLEAN_FILES = Makefile.gnulib.inc |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
231 CONFIG_CLEAN_VPATH_FILES = |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
232 AM_V_P = $(am__v_P_@AM_V@) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
233 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
234 @@ -1642,6 +1642,8 @@ $(srcdir)/config.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
235 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
236 distclean-hdr: |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
237 -rm -f config.h stamp-h1 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
238 +Makefile.gnulib.inc: $(top_builddir)/config.status $(srcdir)/Makefile.gnulib.inc.in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
239 + cd $(top_builddir) && $(SHELL) ./config.status $@ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
240 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
241 # This directory's subdirectories are mostly independent; you can cd |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
242 # into them and run 'make' without going through this Makefile. |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
243 diff --git a/gnulib/configure b/gnulib/configure |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
244 index 5c6add6e371..6c58a46e42e 100644 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
245 --- a/gnulib/configure |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
246 +++ b/gnulib/configure |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
247 @@ -30802,6 +30802,9 @@ fi |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
248 # Checks for libraries. # |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
249 # ---------------------- # |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
250 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
251 +ac_config_files="$ac_config_files Makefile.gnulib.inc" |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
252 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
253 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
254 ac_config_files="$ac_config_files Makefile import/Makefile" |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
255 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
256 ac_config_commands="$ac_config_commands default" |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
257 @@ -31634,6 +31637,7 @@ do |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
258 case $ac_config_target in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
259 "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
260 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
261 + "Makefile.gnulib.inc") CONFIG_FILES="$CONFIG_FILES Makefile.gnulib.inc" ;; |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
262 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
263 "import/Makefile") CONFIG_FILES="$CONFIG_FILES import/Makefile" ;; |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
264 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
265 diff --git a/gnulib/configure.ac b/gnulib/configure.ac |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
266 index acc1b1a322e..052b8bd8dc5 100644 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
267 --- a/gnulib/configure.ac |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
268 +++ b/gnulib/configure.ac |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
269 @@ -56,6 +56,8 @@ AC_CHECK_TOOL(AR, ar) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
270 # Checks for libraries. # |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
271 # ---------------------- # |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
272 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
273 +AC_CONFIG_FILES(Makefile.gnulib.inc) |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
274 + |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
275 AC_OUTPUT(Makefile import/Makefile, |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
276 [ |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
277 case x$CONFIG_HEADERS in |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
278 -- |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
279 2.27.0 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
280 |
055dec6c319b
Allow other packages to use newer Windows API functions.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
281 |