diff options
author | Tom Tromey <tom@tromey.com> | 2019-05-05 17:35:20 -0600 |
---|---|---|
committer | Tom Tromey <tom@tromey.com> | 2019-06-14 12:40:02 -0600 |
commit | 73cc72729a184f00bf6fc4d74684a8516ba6b683 (patch) | |
tree | e6887d2f33a00c23c4ec054d02b9be9f892da571 /gdb/gdbserver | |
parent | f568655424ad268c8c5df3f56e4e19a86b16623d (diff) | |
download | gdb-73cc72729a184f00bf6fc4d74684a8516ba6b683.zip gdb-73cc72729a184f00bf6fc4d74684a8516ba6b683.tar.gz gdb-73cc72729a184f00bf6fc4d74684a8516ba6b683.tar.bz2 |
Move gnulib to top level
This patch moves the gdb/gnulib subdirectory to the top level.
It adjusts the top-level build system to build gnulib when necessary,
and changes gdb to use this. However, gdbserver still builds its own
copy of gnulib, just from the new source location.
A small hack was needed to ensure that gnulib is only built when gdb
is enabled. The Makefile only provides an ordering -- the directory
must be mentioned in configdirs to actually be compiled at all.
Most of the patch is just a "git mv" of gnulib, though a few minor
path adjustments were needed in some files there.
Tested by the buildbot.
ChangeLog
2019-06-14 Tom Tromey <tom@tromey.com>
* MAINTAINERS: Add gnulib.
* gnulib: New directory, move from gdb/gnulib.
* configure.ac (host_libs): Add gnulib.
* configure: Rebuild.
* Makefile.def (host_modules, dependencies): Add gnulib.
* Makefile.in: Rebuild.
gdb/ChangeLog
2019-06-14 Tom Tromey <tom@tromey.com>
* gnulib: Move directory to top-level.
* configure.ac: Don't configure gnulib.
* configure: Rebuild.
* common/common-defs.h: Use new path to gnulib.
* Makefile.in (GNULIB_BUILDDIR): Now ../gnulib.
(GNULIB_H): Remove.
(INCGNU): Look in new gnulib location.
(HFILES_NO_SRCDIR): Remove gnulib files.
(SUBDIR, REQUIRED_SUBDIRS): Remove gnulib.
(generated_files): Remove GNULIB_H.
($(LIBGNU), all-lib): Remove targets.
(distclean): Don't mention GNULIB_BUILDDIR.
($(GNULIB_BUILDDIR)/Makefile): Remove target.
gdb/gdbserver/ChangeLog
2019-06-14 Tom Tromey <tom@tromey.com>
* configure.ac: Use new path to gnulib.
* configure: Rebuild.
* Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path
to gnulib.
gnulib/ChangeLog
2019-06-14 Tom Tromey <tom@tromey.com>
* update-gnulib.sh: Adjust paths.
* Makefile.in: Adjust paths.
* configure.ac: Adjust paths. Use ACX_LARGEFILE.
* configure: Rebuild.
Diffstat (limited to 'gdb/gdbserver')
-rw-r--r-- | gdb/gdbserver/ChangeLog | 7 | ||||
-rw-r--r-- | gdb/gdbserver/Makefile.in | 4 | ||||
-rwxr-xr-x | gdb/gdbserver/configure | 2 | ||||
-rw-r--r-- | gdb/gdbserver/configure.ac | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 460daab..a67a9a2 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2019-06-14 Tom Tromey <tom@tromey.com> + + * configure.ac: Use new path to gnulib. + * configure: Rebuild. + * Makefile.in (INCGNU, $(GNULIB_BUILDDIR)/Makefile): Use new path + to gnulib. + 2019-06-11 Tom Tromey <tom@tromey.com> * Makefile.in (SFILES): Add alloc.c. diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 792325b..b9df2be 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -103,7 +103,7 @@ ustinc = @ustinc@ # gnulib GNULIB_BUILDDIR = build-gnulib-gdbserver LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a -INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import +INCGNU = -I$(srcdir)/../../gnulib/import -I$(GNULIB_BUILDDIR)/import # Generated headers in the gnulib directory. These must be listed # so that they are generated before other files are compiled. @@ -500,7 +500,7 @@ stamp-h: config.in config.status Makefile: Makefile.in config.status CONFIG_HEADERS="" $(SHELL) ./config.status -$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../gnulib/Makefile.in config.status +$(GNULIB_BUILDDIR)/Makefile: $(srcdir)/../../gnulib/Makefile.in config.status @cd $(GNULIB_BUILDDIR); CONFIG_FILES="Makefile" \ CONFIG_COMMANDS="depfiles" \ CONFIG_HEADERS= \ diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index 5ffdeb0..e89f2d0 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -6073,7 +6073,7 @@ fi # "gnulib", to avoid the problem of both GDB and GDBserver wanting to # build it in the same directory, when building in the source dir. - in_src="../gnulib" + in_src="../../gnulib" in_build="build-gnulib-gdbserver" in_extra_args="$gnulib_extra_configure_args" diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac index 98b2253..d943269 100644 --- a/gdb/gdbserver/configure.ac +++ b/gdb/gdbserver/configure.ac @@ -88,7 +88,7 @@ fi # gdbserver/. We need to build gnulib under some other directory not # "gnulib", to avoid the problem of both GDB and GDBserver wanting to # build it in the same directory, when building in the source dir. -ACX_CONFIGURE_DIR(["../gnulib"], ["build-gnulib-gdbserver"], +ACX_CONFIGURE_DIR(["../../gnulib"], ["build-gnulib-gdbserver"], ["$gnulib_extra_configure_args"]) ACX_CONFIGURE_DIR(["../../libiberty"], ["build-libiberty-gdbserver"]) |