From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 0RyIDAnqv2DKbAAAWB0awg (envelope-from ) for ; Tue, 08 Jun 2021 18:07:05 -0400 Received: by simark.ca (Postfix, from userid 112) id 223D31F163; Tue, 8 Jun 2021 18:07:05 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 741611E939 for ; Tue, 8 Jun 2021 18:07:04 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E5CA03985441 for ; Tue, 8 Jun 2021 22:07:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E5CA03985441 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1623190023; bh=l0emL6SZ1b+PoAag6RZB6ZeWZxyMAf/1L+UctWr3qS4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=sSD7bT5xpSUJB3z0/aW6T0w3lnjdYZsOsHTf40xUP80A6Lkm50yj2eetjh2f6MaHD yA0VgwFxK1WrWjMF2+G4ZNHlT4ND+bQE1dtyEAPweqAVWqdLkzCPduIeRmj6GYuFLY 9sfskZx55Gv9n7+/vqBVX0UCuE7DLgEQUjpSJxcg= 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) 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-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: , From: Mike Frysinger via Gdb-patches Reply-To: Mike Frysinger Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" 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