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