From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: make-dist failure on master Date: Sat, 8 Jun 2019 14:43:36 -0700 Organization: UCLA Computer Science Department Message-ID: References: <87v9xf6cdm.fsf@russet.org.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------D19888302C313A5FB2543C15" Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="5698"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 Cc: emacs-devel@gnu.org To: Phillip Lord Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jun 08 23:44:04 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hZj87-00018b-PS for ged-emacs-devel@m.gmane.org; Sat, 08 Jun 2019 23:44:03 +0200 Original-Received: from localhost ([::1]:60796 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZj7w-0002qK-QE for ged-emacs-devel@m.gmane.org; Sat, 08 Jun 2019 17:43:52 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:39469) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hZj7r-0002oy-7n for emacs-devel@gnu.org; Sat, 08 Jun 2019 17:43:48 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hZj7p-0000de-RE for emacs-devel@gnu.org; Sat, 08 Jun 2019 17:43:47 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:46662) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hZj7p-0000Yl-HY for emacs-devel@gnu.org; Sat, 08 Jun 2019 17:43:45 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 21F78161668; Sat, 8 Jun 2019 14:43:41 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id oB0_frNtYStM; Sat, 8 Jun 2019 14:43:39 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 43F36161677; Sat, 8 Jun 2019 14:43:39 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id aFLyZHLBrZrG; Sat, 8 Jun 2019 14:43:39 -0700 (PDT) Original-Received: from [192.168.1.9] (cpe-23-242-74-103.socal.res.rr.com [23.242.74.103]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 1A156161666; Sat, 8 Jun 2019 14:43:39 -0700 (PDT) In-Reply-To: <87v9xf6cdm.fsf@russet.org.uk> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:237335 Archived-At: This is a multi-part message in MIME format. --------------D19888302C313A5FB2543C15 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Thanks for reporting that. It's due to my recent make-dist cleanup. I installed the attached, which should fix it. --------------D19888302C313A5FB2543C15 Content-Type: text/x-patch; name="0001-Fix-out-of-source-make-dist-problems.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-out-of-source-make-dist-problems.patch" >From b721a5f10ee8edfc518f572be5ac675a93da8e91 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 8 Jun 2019 14:08:05 -0700 Subject: [PATCH] Fix out-of-source make-dist problems Problem with jisx2131-filter reported by Phillip Lord in: https://lists.gnu.org/r/emacs-devel/2019-06/msg00147.html * admin/charsets/Makefile.in (SED_SCRIPT): Put it in $(srcdir), which is not necessarily the working directory. ($(SED_SCRIPT)): Rename from jisx2131-filter. All uses changed. (clean): Do not remove SED_SCRIPT. (extraclean): Remove it here instead. * make-dist (possibly_non_vc_files): Remove src/emacs-module.h. Although it is portable and could be distributed in the tarball, it's too much hassle to do that, so let each builder make it. --- admin/charsets/Makefile.in | 12 ++++++------ make-dist | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/admin/charsets/Makefile.in b/admin/charsets/Makefile.in index 0327a5df7e..9f6b3e9e94 100644 --- a/admin/charsets/Makefile.in +++ b/admin/charsets/Makefile.in @@ -96,7 +96,7 @@ MULE = MULE-sisheng.map MULE-tibetan.map \ MULE-lviscii.map MULE-uviscii.map -SED_SCRIPT = jisx2131-filter +SED_SCRIPT = $(srcdir)/jisx2131-filter TRANS_TABLE = cp51932.el eucjp-ms.el TRANS_TABLE := $(addprefix ${lispintdir}/,${TRANS_TABLE}) @@ -200,12 +200,13 @@ ${charsetdir}/JISX0208.map: ${charsetdir}/JISX0212.map: ${GLIBC_CHARMAPS}/EUC-JP.gz ${mapconv} ${compact} ${AM_V_GEN}${run_mapconv} $< '/^<.*[ ]\/x8f/ s,/x8f,,' GLIBC-2-7 ${compact} > $@ -jisx2131-filter: ${mapfiledir}/JISX213A.map +$(SED_SCRIPT): ${mapfiledir}/JISX213A.map ${AM_V_at}sed -n -e '/^#/d' -e 's,.*0x\([0-9A-Z]*\)$$,/0x0*\1$$/d,p' < $< > $@ -${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} jisx2131-filter +${charsetdir}/JISX2131.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} \ + $(SED_SCRIPT) ${AM_V_GEN}${run_mapconv} $< '/^<.*[ ]\/x[a-f]/' GLIBC-2-7 \ - | sed -f jisx2131-filter \ + | sed -f $(SED_SCRIPT) \ | sed -e 's/0x2015/0x2014/' -e 's/0x2299/0x29BF/' > $@ ${charsetdir}/JISX2132.map: ${GLIBC_CHARMAPS}/EUC-JISX0213.gz ${mapconv} @@ -307,7 +308,6 @@ ${charsetdir}/%.map: .PHONY: clean bootstrap-clean distclean maintainer-clean extraclean clean: - rm -f ${SED_SCRIPT} bootstrap-clean: clean @@ -318,4 +318,4 @@ maintainer-clean: ## Do not remove these files, even in a bootstrap. They rarely change. extraclean: - rm -f ${CHARSETS} ${TRANS_TABLE} ${srcdir}/charsets.stamp + rm -f ${CHARSETS} ${SED_SCRIPT} ${TRANS_TABLE} ${srcdir}/charsets.stamp diff --git a/make-dist b/make-dist index e4e6d40d98..228ab75a77 100755 --- a/make-dist +++ b/make-dist @@ -371,7 +371,7 @@ possibly_non_vc_files= $top_level_ChangeLog MANIFEST aclocal.m4 configure admin/charsets/jisx2131-filter - src/config.in src/emacs-module.h + src/config.in "$( find admin doc etc lisp \ \( -name '*.el' -o -name '*.elc' -o -name '*.map' -o -name '*.stamp' \ -- 2.17.1 --------------D19888302C313A5FB2543C15--