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 YDYvEtYnmV9CYgAA0tVLHw (envelope-from ) for ; Wed, 28 Oct 2020 08:12:06 +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 aBYoDtYnmV9lGwAAB5/wlQ (envelope-from ) for ; Wed, 28 Oct 2020 08:12:06 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [IPv6:2607:5300:201:3100::1657]) (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 EBE93940222 for ; Wed, 28 Oct 2020 08:12:04 +0000 (UTC) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id CE2BF270EF; Wed, 28 Oct 2020 04:11:55 -0400 (EDT) Received: from wedjat.horus-it.com (wedjat.horus-it.com [IPv6:2a01:4f9:2a:2e8d::c0de]) by mail.notmuchmail.org (Postfix) with ESMTPS id 56214270E7 for ; Wed, 28 Oct 2020 04:11:53 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by wedjat.horus-it.com (Postfix) with ESMTP id 30ECFA600D2F for ; Wed, 28 Oct 2020 09:11:47 +0100 (CET) X-Virus-Scanned: at horus-it.com Received: from wedjat (wedjat.horus-it.com [IPv6:2a01:4f9:2a:2e8d::c0de]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by wedjat.horus-it.com (Postfix) with ESMTPS id 079D3A600054 for ; Wed, 28 Oct 2020 09:11:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ml.seichter.de; s=k1; t=1603872707; bh=fpMD4IsvhzZNgGn6t8WV/I2tlJFNMrpEVJH8D5TnZLw=; h=From:To:Subject:Date:Message-ID:Content-Type; b=Eq/7+lFoLskSNaxvE110rhd/nU3soW/5+aCBsVV7n2IaSUbDWkyY66aaEJHucQlUo 2Adx0gCM569NT33chcV0Box1fX6RT+fscP7tiScS3JT1ibblvvUMOmZKQrPeQ82RFG LGgC4S/Ua7LxDxmXaG6+hDcN0xPRPRKCTSR19zrgYdof1BJaRqwdYTQCuNd3KVkWNQ DujhWru62b/Ldre5lSIDf1UxzNHXt0UR78GGBugb1SHljY7Owi+dtCf8q4fDh2w3v9 GFq5yW7LsYhHEUAmCNxqLKGgQv5Y2yODO3xaZF4KhX0IHnxqlgTNRFzVs23PJDWSwM 0RbAKn589usmw== From: Ralph Seichter To: notmuch@notmuchmail.org Subject: Clashes between "version" files and C++ keyword Mail-Followup-To: notmuch@notmuchmail.org Date: Wed, 28 Oct 2020 09:11:46 +0100 Message-ID: <87v9euojlp.fsf@wedjat.horus-it.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Message-ID-Hash: YHSKSTVFIOKGQVRL2TBWXGOPBTWLA4NI X-Message-ID-Hash: YHSKSTVFIOKGQVRL2TBWXGOPBTWLA4NI X-MailFrom: ralph@ml.seichter.de 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: X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=ml.seichter.de header.s=k1 header.b=Eq/7+lFo; dmarc=fail reason="SPF not aligned (relaxed)" header.from=ml.seichter.de (policy=none); spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2607:5300:201:3100::1657 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Spam-Score: 0.13 X-TUID: 8zwMAufEITbH --=-=-= Content-Type: text/plain 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. -Ralph [1] https://en.cppreference.com/w/cpp/20#New_headers --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=version.patch 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','') --=-=-= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline --=-=-=--