From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 37C2B3954468 for ; Tue, 8 Jun 2021 22:06:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 37C2B3954468 Received: from vapier.lan (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 4A93E335DB4 for ; Tue, 8 Jun 2021 22:06:44 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] gnulib: allow control over srcdir Date: Tue, 8 Jun 2021 18:06:39 -0400 Message-Id: <20210608220639.1975-1-vapier@gentoo.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 22:06:46 -0000 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. Add a variable so users can control. --- gnulib/Makefile.gnulib.inc.in | 6 +++++- sim/common/Make-common.in | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gnulib/Makefile.gnulib.inc.in b/gnulib/Makefile.gnulib.inc.in index 822f892a189a..fc3d63c39f18 100644 --- a/gnulib/Makefile.gnulib.inc.in +++ b/gnulib/Makefile.gnulib.inc.in @@ -36,9 +36,13 @@ ifndef GNULIB_BUILDDIR $(error missing GNULIB_BUILDDIR) endif +ifndef GNULIB_SRCDIR +GNULIB_SRCDIR = $(srcdir)/../gnulib +endif + LIBGNU = $(GNULIB_BUILDDIR)/import/libgnu.a LIBGNU_EXTRA_LIBS = @FREXPL_LIBM@ @FREXP_LIBM@ @INET_NTOP_LIB@ \ @LIBTHREAD@ @LIB_GETLOGIN@ @LIB_GETRANDOM@ \ @LIB_HARD_LOCALE@ @LIB_MBRTOWC@ \ @LIB_SETLOCALE_NULL@ @LIBINTL@ @LIB_SELECT@ @LIBSOCKET@ -INCGNU = -I$(srcdir)/../gnulib/import -I$(GNULIB_BUILDDIR)/import +INCGNU = -I$(GNULIB_SRCDIR)/import -I$(GNULIB_BUILDDIR)/import diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 4b2587985379..3ea840d935e0 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -41,6 +41,7 @@ srcroot = $(srcdir)/../.. srcsim = $(srcdir)/.. # Helper code from gnulib. +GNULIB_SRCDIR = $(srcroot)/gnulib GNULIB_BUILDDIR = ../../gnulib include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc -- 2.31.1