From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 2CI0JoQRxmEBWwAAgWs5BA (envelope-from ) for ; Fri, 24 Dec 2021 19:29:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id IIm8IYQRxmHleQAAbx9fmQ (envelope-from ) for ; Fri, 24 Dec 2021 18:29:24 +0000 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (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 aspmx1.migadu.com (Postfix) with ESMTPS id 4480D14515 for ; Fri, 24 Dec 2021 19:29:24 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A04DA5F721; Fri, 24 Dec 2021 18:29:16 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id DCC455F719 for ; Fri, 24 Dec 2021 18:29:13 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 398705FC48; Fri, 24 Dec 2021 13:29:13 -0500 (EST) Received: (nullmailer pid 2353762 invoked by uid 1000); Fri, 24 Dec 2021 18:29:11 -0000 From: David Bremner To: Tomi Ollila , David Bremner , Ryan Schmidt , notmuch@notmuchmail.org Subject: [PATCH 2/3] build: move CPPFLAGS after source directory includes. Date: Fri, 24 Dec 2021 14:29:04 -0400 Message-Id: <20211224182905.2353744-2-david@tethera.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211224182905.2353744-1-david@tethera.net> References: <20211224182905.2353744-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: UMJPLSBVDORVAEM35RXHPAHXX5ZVQ5K5 X-Message-ID-Hash: UMJPLSBVDORVAEM35RXHPAHXX5ZVQ5K5 X-MailFrom: bremner@tethera.net 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; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640370564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=7kqnPchPbjC5uyHEeNRJX+Vv1nAw3P3jHJuJ0KtcJBg=; b=Aoxy01sUmpVfHLyWiuXBHy6sGUWwhy+dWRmNP/kArVbDHb9ZHK8jZTyLvpDWVtWLoI6z5o OZMRZZYDo1i/rn1Xu/7CDw8+8ThTdLdueEsNPrAU/BJd+r2Z95Xk3uunROsxpzntaU+te/ iWzt73iIorSU0PbvvnOSEdvIGL03CMUnzZlGpFnlBdn1qoPFwaVpCXhzGzd6J18mIBv7PZ Gey0+f0guP3GMClLtJALMAsS+f0tLVbTFmlpDuJUJrpaNyBcIdgQ6xImQHt0esbUuyUA++ dFnwRNjApbJ4oF0D3nDUTm58iwMTJh1bwRLV8rhWcceKds5eBdMvlKj14p2mIQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640370564; a=rsa-sha256; cv=none; b=owwvAU3sdfO48LFTmythsNYPDqKz9bIF6cFHQZYiYJDXy71HCRWS9XerWdEvCoWaSTjUAE dj3rg1iaawIGfAbaeNLi93OCu0DzbOk4CjSNMBg4VyAw3iw4XwY3tta06Dkt7Xb3+ZRzNr T1jWAIfxeB9L29sUBTrtd1nYHbOtfLLViGG8yIyOBRJW2hugd1QtbZMBks7jfjxu9jk18F D6ltyPCFWI8JK10I0mMLWNgxtqF3CBN80Ac0xUEKv7DuHiDTYYXVFfb4i2yhnOBNBfNFPE xBBZhiVh+ohpQyUC9Maqi6Y5lWU6N1CjkYZmMsI+anbRlq311nZdSMeS0jY5VA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.17 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 4480D14515 X-Spam-Score: -1.17 X-Migadu-Scanner: scn0.migadu.com X-TUID: CR1us0FpL+Bf In [1] Ryan Schmidt reported a problem on macports [2] with notmuch finding an existing installed version of notmuch.h during the build. This is a partial fix; the user might also specify -I in CFLAGS. [1]: id:7851CAB5-4556-4931-A0A2-37003E56C927@ryandesign.com [2]: The problem does not arise when notmuch.h is installed into a "system" include path that the compiler searches by default. --- Makefile.global | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.global b/Makefile.global index e6b00815..b712dd7b 100644 --- a/Makefile.global +++ b/Makefile.global @@ -50,8 +50,8 @@ DETACHED_SIG_FILE=$(TAR_FILE).asc PV_FILE=bindings/python/notmuch/version.py # Smash together user's values with our extra values -FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS) -FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS) +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CPPFLAGS) $(CONFIGURE_CFLAGS) +FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CPPFLAGS) $(CONFIGURE_CXXFLAGS) FINAL_NOTMUCH_LDFLAGS = -Lutil -lnotmuch_util -Llib -lnotmuch $(LDFLAGS) ifeq ($(LIBDIR_IN_LDCONFIG),0) FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS) -- 2.34.1