Re: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS

diff --git a/15/7c0a50570df4241d06fcde28acc28a155c919f b/15/7c0a50570df4241d06fcde28acc28a155c919f
new file mode 100644 (file)
index 0000000..ebab02b
--- /dev/null
+++ b/15/7c0a50570df4241d06fcde28acc28a155c919f
@@ -0,0 +1,110 @@
+Return-Path: <jani@nikula.org>\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 B092E431FB6\r
+       for <notmuch@notmuchmail.org>; Tue, 15 Oct 2013 00:53:08 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 QGccc8wuvx-o for <notmuch@notmuchmail.org>;\r
+       Tue, 15 Oct 2013 00:53:01 -0700 (PDT)\r
+Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com\r
+ [74.125.83.51])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 4D335431FAE   for <notmuch@notmuchmail.org>; Tue, 15 Oct 2013 00:53:01 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f51.google.com with SMTP id c1so3796864eek.24\r
+       for <notmuch@notmuchmail.org>; Tue, 15 Oct 2013 00:53:00 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:in-reply-to:references\r
+       :user-agent:date:message-id:mime-version:content-type;\r
+       bh=kvllRqfCmmS28k0NWRZuQKawj8xkNOVUMUYEAANDR/Y=;\r
+       b=YaaPROuMDjwiVXeMlopqBAmSAhVe/vgy42GZJH2e8SoEl4sU/nd54J7qP15VxwbDnF\r
+       Yj2wHHMYCPgFmOmOgmEDcLrcrF27OPiyOuCGLw40NTGZLmyUDOXOfbQMUB3qmIfH53nj\r
+       2Ar3dlR931VLWbl7KZRYoxOQIGQ2g59tR3Wa15YUZGqEEoF6lqqaIzC3bXtcTiKA4+z0\r
+       Acj8+7Oe/+RamYo1kpr+0Wssk7fz+2GVnZs0/ygUlGJU3xDmc51rqKYEljv/7IOT8a1S\r
+       WQytqEjkNc9UFnoL35q29da6QxpG47H/H44PyTHciWe3w2z7Zg20r6hA9X7wVX8NmPtW\r
+       Un8w==\r
+X-Gm-Message-State:\r
+ ALoCoQk8rvE+LGAIdF1r7dim9PSw2cSJHWakW6mjLNWco4bHuuLqhhNDoA6IHi/hX/ZWS5mE6ZhY\r
+X-Received: by 10.14.29.67 with SMTP id h43mr63381927eea.7.1381823580125;\r
+       Tue, 15 Oct 2013 00:53:00 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id\r
+       l49sm79193692eeo.12.1969.12.31.16.00.00\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Tue, 15 Oct 2013 00:52:59 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Moritz Wilhelmy <mw+notmuch@barfooze.de>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS\r
+In-Reply-To: <1381822245-95400-1-git-send-email-mw+notmuch@barfooze.de>\r
+References: <1381822245-95400-1-git-send-email-mw+notmuch@barfooze.de>\r
+User-Agent: Notmuch/0.16+62~g9f2ae2e (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 15 Oct 2013 09:52:48 +0200\r
+Message-ID: <87wqlf2cof.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Cc: Moritz Wilhelmy <moritz+git@wzff.de>\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: Tue, 15 Oct 2013 07:53:08 -0000\r
+\r
+On Tue, 15 Oct 2013, Moritz Wilhelmy <mw+notmuch@barfooze.de> wrote:\r
+> From: Moritz Wilhelmy <moritz+git@wzff.de>\r
+>\r
+> This ensures that the build will not attempt to use an existing notmuch.h when\r
+> an older version of notmuch is already installed elsewhere (e.g. in /usr/local)\r
+> and /usr/local/include is added to CONFIGURE_CFLAGS by one of the libraries\r
+> (talloc, in my case)\r
+\r
+LGTM. I reached the exact same solution independently when we were\r
+debugging this on IRC.\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+> ---\r
+>  Makefile.local |    4 ++--\r
+>  1 file changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/Makefile.local b/Makefile.local\r
+> index 0464a50..72524eb 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) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags)\r
+> -FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags)\r
+> +FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)\r
+> +FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_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
+> -- \r
+> 1.7.9.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r