From 1b0f7d239821bc788640bf987bd32956a1fddee6 Mon Sep 17 00:00:00 2001 From: david Date: Sun, 26 May 2013 22:28:12 +2100 Subject: [PATCH] [PATCH 2/3] configure: grab CPPFLAGS from the environment. --- 4a/38872cade10c099ba311dc404159d0d350e4c7 | 92 +++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 4a/38872cade10c099ba311dc404159d0d350e4c7 diff --git a/4a/38872cade10c099ba311dc404159d0d350e4c7 b/4a/38872cade10c099ba311dc404159d0d350e4c7 new file mode 100644 index 000000000..62b02513c --- /dev/null +++ b/4a/38872cade10c099ba311dc404159d0d350e4c7 @@ -0,0 +1,92 @@ +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 E35BA431FBC + for ; Sat, 25 May 2013 18:28:56 -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 ypzvQld5+2-J 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 8BC19431FAE + for ; Sat, 25 May 2013 18:28:38 -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 r4Q1SU7g019217; + Sat, 25 May 2013 22:28:30 -0300 +Received: from remotemail by tesseract.cs.unb.ca with local (Exim 4.80) + (envelope-from ) + id 1UgPl8-0004w1-7v; Sat, 25 May 2013 22:28:30 -0300 +Received: (nullmailer pid 17207 invoked by uid 1000); + Sun, 26 May 2013 01:28:16 -0000 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [PATCH 2/3] configure: grab CPPFLAGS from the environment. +Date: Sat, 25 May 2013 22:28:12 -0300 +Message-Id: <1369531693-16918-3-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:57 -0000 + +From: David Bremner + +This is needed in particular for hardening flags. +--- + configure | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure b/configure +index 460fcfc..3ba1ec3 100755 +--- a/configure ++++ b/configure +@@ -43,6 +43,7 @@ fi + CC=${CC:-gcc} + CXX=${CXX:-g++} + CFLAGS=${CFLAGS:--O2} ++CPPFLAGS=${CPPFLAGS:-} + CXXFLAGS=${CXXFLAGS:-\$(CFLAGS)} + LDFLAGS=${LDFLAGS:-} + XAPIAN_CONFIG=${XAPIAN_CONFIG:-xapian-config} +@@ -91,6 +92,7 @@ First, some common variables can specified via environment variables: + + CC The C compiler to use + CFLAGS Flags to pass to the C compiler ++ CPPFLAGS Flags to pass to the C preprocessor + CXX The C++ compiler to use + CXXFLAGS Flags to pass to the C compiler + LDFLAGS Flags to pass when linking +@@ -615,6 +617,9 @@ EMACS = emacs --quick + # Default FLAGS for C compiler (can be overridden by user such as "make CFLAGS=-g") + CFLAGS = ${CFLAGS} + ++# Default FLAGS for C preprocessor (can be overridden by user such as "make CPPFLAGS=-I/usr/local/include") ++CPPFLAGS = ${CPPFLAGS} ++ + # Default FLAGS for C++ compiler (can be overridden by user such as "make CXXFLAGS=-g") + CXXFLAGS = ${CXXFLAGS} + +-- +1.7.10.4 + -- 2.26.2