From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 94D5F39AD0EC for ; Thu, 6 Jun 2024 17:50:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 94D5F39AD0EC Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 94D5F39AD0EC Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717696211; cv=none; b=H/xndyz2s+cUkjtV9ppbar+imzYrl9B1K4JEIzEqu3accbOS61l7Nz1Cx09JlbkNICNj2yFQUYEomJh2sBhpmWmxV14Brs8EAoWsrYR+jWomlCOIzzjjV4lwXPYMAtc10yLajB7fpeDN+P9+WTbyb4b5ZD6MLthDjeguaQJRWA8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717696211; c=relaxed/simple; bh=vl56Se0zSwinV2sd5VSsZoilRxPtIm+guZzzKnZ/HaM=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=JRbuO28O4IwDy9PXRZmcX7idhPzYm54btjMg6qGJ0DVPgRLE+BOiHPVXZlYBwcR9Iz1LOH0DGX2+GcgmNqVl5lCAtiiG9YqhpaLT+8CcxuJy7xRHja+MBhSj4/B9adG1bW7QgipiRwJy3SNJDFjZ4TL3WCQzYKbh9Fn3CeLdYOo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717696207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Pp5WZYoQoUlwYcyANvmybE9rnBSar06K6GQNLNXgO3Y=; b=e2j8wR0lX3Wh2z4VhkYgDa4vkNpMd/RdIm09c+T6EOD2zTo9P9XUWXdoU2Ya2yDFL/36EP UmULySBBn9QB1xpJRA2LzJJ1NjfhjQby0rIKIwjJm4BTeYB43fnCELRhZJwGVQkw+5qkxi 1ufn7nw66mQVm5DgE0tweFj9hGqJoEo= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-393-z9HZT_JeMxeCDmz70qM9Wg-1; Thu, 06 Jun 2024 13:50:06 -0400 X-MC-Unique: z9HZT_JeMxeCDmz70qM9Wg-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a6912c4ddb1so66656066b.1 for ; Thu, 06 Jun 2024 10:50:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717696204; x=1718301004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Pp5WZYoQoUlwYcyANvmybE9rnBSar06K6GQNLNXgO3Y=; b=ff9I7NPQy/sShkwmTH14F4Wd5VjLi67RKxenjFxl5yAS12G+uVkMYheQ8r9JPdtT2m lr4n0IIjbksLn/Nn3mZhfnE0Z7ac8JLOkIoYt9k6CCB/cXw3/uRJF9XJ//u7JCKl5l/n PQ0sQS6Im+74OAExZJsmU0ch3XtwipQrOwgOkT/kRenQqRm4uEyjeBliSFHBh/oxFbWq XbwPc7Yr8BpeDaufHFh3ae2kFhIif0C7pAj6Cn9JSVSlJDbQ0DHBKeERu6Q6lKXSrcCf 1tN1/kMjJnOvoQQ4DKfQHBWjm8ZtdXn0QNclIgVNkORbpUnSX54dRaJL+7fN37ir+jgg tG1g== X-Gm-Message-State: AOJu0YzMwh39I1mHRU2O+fG6xmBQq6v9biEua4nuJllbHVcsoTZ1Mnfy L5yjwnT+0REx+QNCSp/B/Dz9W0CHw2pgsgSzWXTm8+Hs07+Zv5/G+Jpa75fumg/EmZzDMPp/Z+X uQBJ/A2FgahCfH7hHelKeEwHN8s7Z/qV3lorBE3r+prR46ctOshuph++sMunrGmilntxLVCVhg5 3tGS1ZYeE/011PXtX5a7RHN6scRqfgHNMiVuDPqF8neBY= X-Received: by 2002:a17:906:52d1:b0:a59:9c58:763a with SMTP id a640c23a62f3a-a6cd7891eb4mr21189066b.46.1717696203790; Thu, 06 Jun 2024 10:50:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGj0besCbpSWgiK4LouqsFF1he/PYTIOa7oMPff/VOwiRi7y51c4GqF95W44WswRxhA0soU1g== X-Received: by 2002:a17:906:52d1:b0:a59:9c58:763a with SMTP id a640c23a62f3a-a6cd7891eb4mr21187766b.46.1717696203308; Thu, 06 Jun 2024 10:50:03 -0700 (PDT) Received: from localhost (92.40.184.206.threembb.co.uk. [92.40.184.206]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a6c805c9662sm124907366b.51.2024.06.06.10.50.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Jun 2024 10:50:02 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Andrew Burgess Subject: [PATCHv3 1/6] gdb/doc: don't try to copy GDBvn.texi from the source tree Date: Thu, 6 Jun 2024 18:49:53 +0100 Message-Id: <325b35e804c26c1d8b955cc17752629a7e677e26.1717696065.git.aburgess@redhat.com> X-Mailer: git-send-email 2.25.4 In-Reply-To: References: MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: The build recipe for gdb.dvi and gdb.pdf contains instructions for copying the GDBvn.texi file from the source tree into the build directory if the GDBvn.texi file doesn't already exist in the build directory. The gdb.dvi and gdb.pdf targets also have a dependency on GDBvn.texi, and we have a recipe for building GDBvn.texi. What's happening here is this: - In a git checkout of the source tree there is no GDBvn.texi in the source tree, the GDBvn.texi dependency will trigger a rebuild of GDBvn.texi, which is then used to build gdb.dvi and/or gdb.pdf. - In a release tar file we do include a copy of GDBvn.texi. This file will appear to be up to date, and so no copy of GDBvn.texi is created within the build directory. Now when building gdb.dvi and/or gdb.pdf we copy (or symlink) the version of GDBvn.texi from the source tree into the build directory. However, copying GDBvn.texi into the source directory is completely unnecessary. The gdb.dvi/gdb.pdf recipes both invoke texi2dvi and pass '-I $(srcdir)' as an argument, this means that texi2dvi will look in the $(srcdir) to find included files, including GDBvn.texi. As such I believe we can remove the code that copies GDBvn.texi from the source tree into the build tree. I've tested with a release build; creating a release with: ./src-release gdb Then in an empty directory, unpacking the resulting .tar file, creating a parallel build directory and doing the usual configure, make, and 'make install'. Having done this I can then 'touch gdb/doc/*.texinfo' in the unpacked source tree, and do 'make -C gdb/doc pdf dvi' to rebuild all the pdf and dvi files, this works fine without having to either build or copy GDBvn.texi into the build directory. --- gdb/doc/Makefile.in | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/gdb/doc/Makefile.in b/gdb/doc/Makefile.in index d9c13873a60..1a0791d518f 100644 --- a/gdb/doc/Makefile.in +++ b/gdb/doc/Makefile.in @@ -477,15 +477,6 @@ gdb-cfg.texi: ${srcdir}/${DOC_CONFIG}-cfg.texi ln ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi || \ cp ${srcdir}/${DOC_CONFIG}-cfg.texi gdb-cfg.texi -# GDB MANUAL: texinfo source, using @set/@clear/@value/@ifset/@ifclear -# If your texinfo or makeinfo don't support these, get a new texinfo release -# -# The nonsense with GDBvn.texi gets this to run with both Sun and GNU make. -# Note that we can *generate* GDBvn.texi, but since we distribute one in the -# source directory for the benefit of people who *don't* use this makefile, -# VPATH will often tell make not to bother building it, because the one -# in the srcdir is up to date. (if not, then make should build one here). - # Clean these up before each run. Avoids a catch 22 with not being # able to re-generate these files (to fix a corruption) because these # files contain a corruption. @@ -494,10 +485,6 @@ GDB_TEX_TMPS = gdb.aux gdb.cp* gdb.fn* gdb.ky* gdb.log gdb.pg* gdb.toc \ # GDB MANUAL: TeX dvi file gdb.dvi: ${GDB_DOC_FILES} - $(SILENCE) if [ ! -f ./GDBvn.texi ]; then \ - (test "$(LN_S)" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \ - ln $(srcdir)/GDBvn.texi . || \ - cp $(srcdir)/GDBvn.texi . ; else true; fi $(SILENCE) rm -f $(GDB_TEX_TMPS) $(ECHO_TEXI2DVI) $(TEXI2DVI) $(SILENT_Q_FLAG) $(READLINE_TEXI_INCFLAG) \ -I ${GDBMI_DIR} -I $(srcdir) $(srcdir)/gdb.texinfo @@ -506,10 +493,6 @@ gdb.ps: gdb.dvi $(ECHO_DVIPS) $(DVIPS) $(SILENT_Q_FLAG) -o $@ $? gdb.pdf: ${GDB_DOC_FILES} - $(SILENCE) if [ ! -f ./GDBvn.texi ]; then \ - (test "$(LN_S)" = "ln -s" && ln -s $(srcdir)/GDBvn.texi .) || \ - ln $(srcdir)/GDBvn.texi . || \ - cp $(srcdir)/GDBvn.texi . ; else true; fi $(SILENCE) rm -f $(GDB_TEX_TMPS) $(ECHO_TEXI2DVI) $(TEXI2DVI) $(SILENT_Q_FLAG) --pdf \ $(READLINE_TEXI_INCFLAG) -I ${GDBMI_DIR} -I $(srcdir) \ -- 2.25.4