[PATCH 3/3] build: pass CPPFLAGS to C and C++ compilers

diff --git a/e0/304197677b91997d74ef5e9e2d4943c53c3eac b/e0/304197677b91997d74ef5e9e2d4943c53c3eac
new file mode 100644 (file)
index 0000000..b54db71
--- /dev/null
+++ b/e0/304197677b91997d74ef5e9e2d4943c53c3eac
@@ -0,0 +1,91 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id DB6EA431FC9\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 18:28:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 6gZIibI5i04I for <notmuch@notmuchmail.org>;\r
+       Sat, 25 May 2013 18:28:51 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id A1060431FD4\r
+       for <notmuch@notmuchmail.org>; Sat, 25 May 2013 18:28:40 -0700 (PDT)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id r4Q1SXH7019220;\r
+       Sat, 25 May 2013 22:28:33 -0300\r
+Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1UgPlB-0004wH-JC; Sat, 25 May 2013 22:28:33 -0300\r
+Received: (nullmailer pid 17209 invoked by uid 1000);\r
+       Sun, 26 May 2013 01:28:16 -0000\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/3] build: pass CPPFLAGS to C and C++ compilers\r
+Date: Sat, 25 May 2013 22:28:13 -0300\r
+Message-Id: <1369531693-16918-4-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1369531693-16918-1-git-send-email-david@tethera.net>\r
+References: <1369531693-16918-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 26 May 2013 01:28:56 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This is used in particular by hardening flags.\r
+---\r
+ Makefile.local |    8 ++++----\r
+ 1 file changed, 4 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index c274f07..644623f 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -39,8 +39,8 @@ GPG_FILE=$(SHA1_FILE).asc\r
+ PV_FILE=bindings/python/notmuch/version.py\r
+ \r
+ # Smash together user's values with our extra values\r
+-FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)\r
+-FINAL_CXXFLAGS = $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)\r
++FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)\r
++FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)\r
+ FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS)\r
+ FINAL_NOTMUCH_LINKER = CC\r
+ ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)\r
+@@ -237,11 +237,11 @@ quiet ?= $($(shell echo $1 | sed -e s'/ .*//'))\r
+ \r
+ %.o: %.cc $(global_deps)\r
+       @mkdir -p .deps/$(@D)\r
+-      $(call quiet,CXX $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
++      $(call quiet,CXX $(CPPFLAGS) $(CXXFLAGS)) -c $(FINAL_CXXFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
+ \r
+ %.o: %.c $(global_deps)\r
+       @mkdir -p .deps/$(@D)\r
+-      $(call quiet,CC $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
++      $(call quiet,CC $(CPPFLAGS) $(CFLAGS)) -c $(FINAL_CFLAGS) $< -o $@ -MD -MP -MF .deps/$*.d\r
+ \r
+ .PHONY : clean\r
+ clean:\r
+-- \r
+1.7.10.4\r
+\r