From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UIqlL7t3mV8wJgAA0tVLHw (envelope-from ) for ; Wed, 28 Oct 2020 13:52:59 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id GC1YK7t3mV84AQAAB5/wlQ (envelope-from ) for ; Wed, 28 Oct 2020 13:52:59 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A4BD794021E for ; Wed, 28 Oct 2020 13:52:57 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id CCA1F270F5; Wed, 28 Oct 2020 09:52:49 -0400 (EDT) Received: from lahtoruutu.iki.fi (lahtoruutu.iki.fi [185.185.170.37]) by mail.notmuchmail.org (Postfix) with ESMTPS id 3340B270ED for ; Wed, 28 Oct 2020 09:52:47 -0400 (EDT) Received: from guru.guru-group.fi (unknown [IPv6:2a02:2380:1:9:5054:ff:feb7:a4bc]) (using TLSv1.2 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: too) by lahtoruutu.iki.fi (Postfix) with ESMTPSA id EE2F21B005DB; Wed, 28 Oct 2020 15:52:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1603893163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rJoGd+vIphwhYdSaVtFesoEYhNzT7lZQXNIFmBKMHQ4=; b=PU2Unc8qRf+InVcKj7MJq0xtmN9e4gsY7JK2FThMcHAKE5byGFbROM69ipVMbq/2ldOa6q bXd63FsEZzWBDk4AkAk0Fz8VOXjV5gJUZkh8XVt3ooYSDPg4o1Ys5lE+gxD/5aFV/dKQwE m4Pb2pkKFDbliPajWKpQZmZw4L9cno9flM32HAXwA/1o6NrqmNB6EsoCldOZp4V6nHS6+K XbZoCjAvWiKrDVOZQqzdq/pa25/Z5Wv3wghUScVA1oulLaP2LpDkZKR7tORBMXenW8FHf2 uxmJBLJW4Jr5uFZb3em2pyYcOJoek0ykNTifMtWsQBj32xzsEKM7kMMKP5R4oQ== From: Tomi Ollila To: Ralph Seichter , notmuch@notmuchmail.org Subject: Re: Clashes between "version" files and C++ keyword In-Reply-To: <87v9euojlp.fsf@wedjat.horus-it.com> References: <87v9euojlp.fsf@wedjat.horus-it.com> User-Agent: Notmuch/0.31+4~gea158b8 (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=lahtoruutu; t=1603893163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=rJoGd+vIphwhYdSaVtFesoEYhNzT7lZQXNIFmBKMHQ4=; b=ZyaSphOPGE7+EEKzbxFld3IemryjcUOMjEqNaMivg/IF4raXfeUzL4ZjI7L7FcfyOVOyJB 0naQk14ehEvU4FeDBsG/w4mHOl3LvGwhJPS5QWHtT42aEusi4JJMj0oB31iy1j9+ZQ/Z4f 9eVJeCbTZ2pdlkUJ4MFoqZ2SScjHon0Sh2YVBakkoJInl1Wdk6YjPOTxtGqAQWvv52ZOP+ XvDeji8SXPkFUNZc8j8mfNLLjnwLV6mQK7V97OPnScy6GBGqrA6RmNIB6Mzowb6GTyFcO/ 1Jb1u/urF2yg/dUYfBRS0QF8ecqP+ZBx8r485kb5DWMXVHlnaFYhgV4BJBCxsg== ARC-Seal: i=1; s=lahtoruutu; d=iki.fi; t=1603893163; a=rsa-sha256; cv=none; b=IgmMiB4ooanVwJm9COmYO33x9Fxmwkvgfu+SJKZaHRb0jZDqlw8QpdtuQgtuSE0a8U5o2s WfJFDkByEfRJQPNH/w7hnFI/KLrKNeBXfFBWCzWNiVYjtqQZykeuchpuuXWhXiLkttMnjK Z+9FU/a/UmI/SNDf3UMEUh/oinl0OzgI3kT5/tjDPwp/zI2o0dGY1K/AiA/Rs6Vj2UTtSc 9lRfiGViy4wBVGzlC2XORTJTkre1kctVuMiFX7VqifC+JWFMUh97U4vl0FU7UuEaRUgry2 u05ZKcslblj/d1nUcxwDN9WrZuFHL4mXQNyXNA5J/IrfBTaJeQJIQjfdppsVUA== ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi Message-ID-Hash: HLF4YMQBJAUVCJQPTBMRWNVYVE4VBTML X-Message-ID-Hash: HLF4YMQBJAUVCJQPTBMRWNVYVE4VBTML X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=iki.fi header.s=lahtoruutu header.b=PU2Unc8q; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 2.03 X-TUID: YS2mgjwj2EvH On Wed, Oct 28 2020, Ralph Seichter wrote: > Building Notmuch on macOS is known to cause problems because the Notmuch > distribution archive contains two files named "version". These clash > with the keyword as defined in C++20 [1] and will likely > become obvious on other platforms as well once Compilers adopt the new > standard. > > The two affected files in the Notmuch Git tree are > > /bindings/python-cffi/version > /version > > I suggest to rename them both to version.txt. The attached patch can > then be applied to make the necessary build file changes. good stuff! Could you send git am -able patch to the mailing list ? Tomi > > -Ralph > > [1] https://en.cppreference.com/w/cpp/20#New_headers > > diff --git Makefile.global Makefile.global > index cd489ef2..8477468d 100644 > --- Makefile.global > +++ Makefile.global > @@ -17,7 +17,7 @@ else > DATE:=$(shell date +%F) > endif > > -VERSION:=$(shell cat ${srcdir}/version) > +VERSION:=$(shell cat ${srcdir}/version.txt) > ELPA_VERSION:=$(subst ~,_,$(VERSION)) > ifeq ($(filter release release-message pre-release update-versions,$(MAKECMDGOALS)),) > ifeq ($(IS_GIT),yes) > diff --git Makefile.local Makefile.local > index c65cee7c..dde7981b 100644 > --- Makefile.local > +++ Makefile.local > @@ -19,7 +19,7 @@ endif > > # Depend (also) on the file 'version'. In case of ifeq ($(IS_GIT),yes) > # this file may already have been updated. > -version.stamp: $(srcdir)/version > +version.stamp: $(srcdir)/version.txt > echo $(VERSION) > $@ > > $(TAR_FILE): > diff --git bindings/python-cffi/setup.py bindings/python-cffi/setup.py > index b0060835..cda52338 100644 > --- bindings/python-cffi/setup.py > +++ bindings/python-cffi/setup.py > @@ -1,6 +1,6 @@ > import setuptools > > -with open('version') as fp: > +with open('version.txt') as fp: > VERSION = fp.read().strip() > > setuptools.setup( > diff --git doc/conf.py doc/conf.py > index 94e266af..11bed51d 100644 > --- doc/conf.py > +++ doc/conf.py > @@ -19,7 +19,7 @@ copyright = u'2009-2020, Carl Worth and many others' > location = os.path.dirname(__file__) > > for pathdir in ['.', '..']: > - version_file = os.path.join(location,pathdir,'version') > + version_file = os.path.join(location,pathdir,'version.txt') > if os.path.exists(version_file): > with open(version_file,'r') as infile: > version=infile.read().replace('\n','') > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org