From 99cd5640c79c052f1912e71d9ce0349cfecc2463 Mon Sep 17 00:00:00 2001 From: Moritz Wilhelmy Date: Tue, 15 Oct 2013 09:30:45 +0200 Subject: [PATCH] [PATCH] Place extra_cflags before CONFIGURE_CFLAGS --- 38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4 | 73 +++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4 diff --git a/38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4 b/38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4 new file mode 100644 index 000000000..fd0df9f75 --- /dev/null +++ b/38/8ef5abe1a890dd3179153fe3e8f1e22e7364b4 @@ -0,0 +1,73 @@ +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 859CA431FAF + for ; Tue, 15 Oct 2013 00:30:53 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 0WEG0tPh4mNN for ; + Tue, 15 Oct 2013 00:30:49 -0700 (PDT) +Received: from furnace.wzff.de (furnace.wzff.de [176.9.216.40]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 750F0431FAE + for ; Tue, 15 Oct 2013 00:30:49 -0700 (PDT) +Received: from mw by furnace.wzff.de with local (Exim 4.80.1 (FreeBSD)) + (envelope-from ) + id 1VVz5a-000OpI-QK; Tue, 15 Oct 2013 09:30:46 +0200 +From: Moritz Wilhelmy +To: notmuch@notmuchmail.org +Subject: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS +Date: Tue, 15 Oct 2013 09:30:45 +0200 +Message-Id: <1381822245-95400-1-git-send-email-mw+notmuch@barfooze.de> +X-Mailer: git-send-email 1.7.9.4 +Cc: Moritz Wilhelmy +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: Tue, 15 Oct 2013 07:30:53 -0000 + +From: Moritz Wilhelmy + +This ensures that the build will not attempt to use an existing notmuch.h when +an older version of notmuch is already installed elsewhere (e.g. in /usr/local) +and /usr/local/include is added to CONFIGURE_CFLAGS by one of the libraries +(talloc, in my case) +--- + Makefile.local | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile.local b/Makefile.local +index 0464a50..72524eb 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) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(CONFIGURE_CFLAGS) $(extra_cflags) +-FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(CONFIGURE_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) ++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_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) + FINAL_NOTMUCH_LINKER = CC + ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1) +-- +1.7.9.4 + -- 2.26.2