mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-23 10:03:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gnulib: define the path to gnulib's parent dir

Browse Source 
The current setting assumes that gnulib is only used by dirs
immediately under the source root.  Trying to build it two or
more levels deep fails.  Switch GNULIB_BUILDDIR to a relative
GNULIB_PARENT_DIR so that it can be used to construct both the
build & source paths.
This commit is contained in:
Mike Frysinger 2021-06-08 18:04:28 -04:00
parent 09db4332c6
commit 483ab96a1b
8 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (GNULIB_BUILDDIR): Rename to ...
(GNULIB_PARENT_DIR): ... this. Remove "gnulib" from value.
2021-06-14 John Baldwin <jhb@FreeBSD.org> 2021-06-14 John Baldwin <jhb@FreeBSD.org>
* configure.ac: Check for <sys/procctl.h>. * configure.ac: Check for <sys/procctl.h>.

4
gdb/Makefile.in
View File

@ -245,8 +245,8 @@ CODESIGN_CERT = @CODESIGN_CERT@
GDBFLAGS = GDBFLAGS =
# Helper code from gnulib. # Helper code from gnulib.
GNULIB_BUILDDIR = ../gnulib GNULIB_PARENT_DIR = ..
include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
SUPPORT = ../gdbsupport SUPPORT = ../gdbsupport
LIBSUPPORT = $(SUPPORT)/libgdbsupport.a LIBSUPPORT = $(SUPPORT)/libgdbsupport.a

8
gdbserver/ChangeLog
View File

@ -1,3 +1,8 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (GNULIB_BUILDDIR): Rename to ...
(GNULIB_PARENT_DIR): ... this. Remove "gnulib" from value.
2021-05-27 Simon Marchi <simon.marchi@polymtl.ca> 2021-05-27 Simon Marchi <simon.marchi@polymtl.ca>
* Fix some indentation mistakes throughout. * Fix some indentation mistakes throughout.
@ -5712,8 +5717,7 @@
* gdbreplay.c: Fix common/ includes. * gdbreplay.c: Fix common/ includes.
* fork-child.c: Fix common/ includes. * fork-child.c: Fix common/ includes.
* event-loop.c: Fix common/ includes. * event-loop.c: Fix common/ includes.
* ax.c: * ax.c (enum gdb_agent_op): Fix common/ includes.
(enum gdb_agent_op): Fix common/ includes.
2019-01-21 Tom Tromey <tom@tromey.com> 2019-01-21 Tom Tromey <tom@tromey.com>

4
gdbserver/Makefile.in
View File

@ -122,8 +122,8 @@ ustlibs = @ustlibs@
ustinc = @ustinc@ ustinc = @ustinc@
# gnulib # gnulib
GNULIB_BUILDDIR = ../gnulib GNULIB_PARENT_DIR = ..
include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
# Where is the INTL library? Typically in ../intl. # Where is the INTL library? Typically in ../intl.
INTL = @LIBINTL@ INTL = @LIBINTL@

7
gnulib/ChangeLog
View File

@ -1,3 +1,10 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* Makefile.gnulib.inc.in (GNULIB_BUILDDIR): Rename to ...
(GNULIB_PARENT_DIR): ... this.
(LIBGNU): Add "/gnulib" after $(GNULIB_PARENT_DIR).
(INCGNU): Likewise. Replace .. with $(GNULIB_PARENT_DIR).
2021-06-08 Mike Frysinger <vapier@gentoo.org> 2021-06-08 Mike Frysinger <vapier@gentoo.org>
* update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add netdb. * update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add netdb.

10
gnulib/Makefile.gnulib.inc.in
View File

@ -32,13 +32,15 @@
# INCGNU: A list of -I.... include paths that should be passed to the # INCGNU: A list of -I.... include paths that should be passed to the
# compiler, these are where the gnulib headers can be found. # compiler, these are where the gnulib headers can be found.
ifndef GNULIB_BUILDDIR # Packages must define the relative path to gnulib's parent dir.
$(error missing GNULIB_BUILDDIR) ifndef GNULIB_PARENT_DIR
$(error missing GNULIB_PARENT_DIR)
endif endif
LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a LIBGNU = $(GNULIB_PARENT_DIR)/gnulib/import/libgnu.a
LIBGNU_EXTRA_LIBS = @FREXPL_LIBM@ @FREXP_LIBM@ @INET_NTOP_LIB@ \ LIBGNU_EXTRA_LIBS = @FREXPL_LIBM@ @FREXP_LIBM@ @INET_NTOP_LIB@ \
@LIBTHREAD@ @LIB_GETLOGIN@ @LIB_GETRANDOM@ \ @LIBTHREAD@ @LIB_GETLOGIN@ @LIB_GETRANDOM@ \
@LIB_HARD_LOCALE@ @LIB_MBRTOWC@ \ @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ \
@LIB_SETLOCALE_NULL@ @LIBINTL@ @LIB_SELECT@ @LIBSOCKET@ @LIB_SETLOCALE_NULL@ @LIBINTL@ @LIB_SELECT@ @LIBSOCKET@
INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import INCGNU = -I$(srcdir)/$(GNULIB_PARENT_DIR)/gnulib/import \
-I$(GNULIB_PARENT_DIR)/gnulib/import

5
sim/common/ChangeLog
View File

@ -1,3 +1,8 @@
2021-06-14 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (GNULIB_BUILDDIR): Rename to ...
(GNULIB_PARENT_DIR): ... this. Remove "gnulib" from value.
2021-06-12 Mike Frysinger <vapier@gentoo.org> 2021-06-12 Mike Frysinger <vapier@gentoo.org>
* Make-common.in (COMMON_OBJS_NAMES): Add portability.o. * Make-common.in (COMMON_OBJS_NAMES): Add portability.o.

4
sim/common/Make-common.in
View File

@ -41,8 +41,8 @@ srcroot = $(srcdir)/../..
srcsim = $(srcdir)/.. srcsim = $(srcdir)/..
# Helper code from gnulib. # Helper code from gnulib.
GNULIB_BUILDDIR = ../../gnulib GNULIB_PARENT_DIR = ../..
include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@