From: Jani Nikula Date: Tue, 15 Oct 2013 07:52:48 +0000 (+0200) Subject: Re: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a96ec3fad2ce489a638a4314e3c265712e5a2a63;p=notmuch-archives.git Re: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS --- diff --git a/15/7c0a50570df4241d06fcde28acc28a155c919f b/15/7c0a50570df4241d06fcde28acc28a155c919f new file mode 100644 index 000000000..ebab02b12 --- /dev/null +++ b/15/7c0a50570df4241d06fcde28acc28a155c919f @@ -0,0 +1,110 @@ +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 B092E431FB6 + for ; Tue, 15 Oct 2013 00:53:08 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 QGccc8wuvx-o for ; + Tue, 15 Oct 2013 00:53:01 -0700 (PDT) +Received: from mail-ee0-f51.google.com (mail-ee0-f51.google.com + [74.125.83.51]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 4D335431FAE for ; Tue, 15 Oct 2013 00:53:01 -0700 + (PDT) +Received: by mail-ee0-f51.google.com with SMTP id c1so3796864eek.24 + for ; Tue, 15 Oct 2013 00:53:00 -0700 (PDT) +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:in-reply-to:references + :user-agent:date:message-id:mime-version:content-type; + bh=kvllRqfCmmS28k0NWRZuQKawj8xkNOVUMUYEAANDR/Y=; + b=YaaPROuMDjwiVXeMlopqBAmSAhVe/vgy42GZJH2e8SoEl4sU/nd54J7qP15VxwbDnF + Yj2wHHMYCPgFmOmOgmEDcLrcrF27OPiyOuCGLw40NTGZLmyUDOXOfbQMUB3qmIfH53nj + 2Ar3dlR931VLWbl7KZRYoxOQIGQ2g59tR3Wa15YUZGqEEoF6lqqaIzC3bXtcTiKA4+z0 + Acj8+7Oe/+RamYo1kpr+0Wssk7fz+2GVnZs0/ygUlGJU3xDmc51rqKYEljv/7IOT8a1S + WQytqEjkNc9UFnoL35q29da6QxpG47H/H44PyTHciWe3w2z7Zg20r6hA9X7wVX8NmPtW + Un8w== +X-Gm-Message-State: + ALoCoQk8rvE+LGAIdF1r7dim9PSw2cSJHWakW6mjLNWco4bHuuLqhhNDoA6IHi/hX/ZWS5mE6ZhY +X-Received: by 10.14.29.67 with SMTP id h43mr63381927eea.7.1381823580125; + Tue, 15 Oct 2013 00:53:00 -0700 (PDT) +Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3]) + by mx.google.com with ESMTPSA id + l49sm79193692eeo.12.1969.12.31.16.00.00 + (version=TLSv1.1 cipher=RC4-SHA bits=128/128); + Tue, 15 Oct 2013 00:52:59 -0700 (PDT) +From: Jani Nikula +To: Moritz Wilhelmy , notmuch@notmuchmail.org +Subject: Re: [PATCH] Place extra_cflags before CONFIGURE_CFLAGS +In-Reply-To: <1381822245-95400-1-git-send-email-mw+notmuch@barfooze.de> +References: <1381822245-95400-1-git-send-email-mw+notmuch@barfooze.de> +User-Agent: Notmuch/0.16+62~g9f2ae2e (http://notmuchmail.org) Emacs/23.2.1 + (x86_64-pc-linux-gnu) +Date: Tue, 15 Oct 2013 09:52:48 +0200 +Message-ID: <87wqlf2cof.fsf@nikula.org> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +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:53:08 -0000 + +On Tue, 15 Oct 2013, Moritz Wilhelmy wrote: +> 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) + +LGTM. I reached the exact same solution independently when we were +debugging this on IRC. + +BR, +Jani. + + +> --- +> 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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch