From: Tomi Ollila <tomi.ollila@iki.fi>
Date: Sun, 26 May 2013 11:34:57 +0000 (+0300)
Subject: Re: [PATCH v2] build: fix out-of-tree builds
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23f0bcfd15f9c763e44675f32c7fe1ce4b0547be;p=notmuch-archives.git

Re: [PATCH v2] build: fix out-of-tree builds
---

diff --git a/b4/c63b1d06c4e085eed6a21bbf89d7eb96c1fdd8 b/b4/c63b1d06c4e085eed6a21bbf89d7eb96c1fdd8
new file mode 100644
index 000000000..c71167f9e
--- /dev/null
+++ b/b4/c63b1d06c4e085eed6a21bbf89d7eb96c1fdd8
@@ -0,0 +1,125 @@
+Return-Path: <tomi.ollila@iki.fi>
+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 5EAAF431FBF
+	for <notmuch@notmuchmail.org>; Sun, 26 May 2013 04:35:14 -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 pzErhlv3piQR for <notmuch@notmuchmail.org>;
+	Sun, 26 May 2013 04:35:01 -0700 (PDT)
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])
+	by olra.theworths.org (Postfix) with ESMTP id 9A2DE431FAE
+	for <notmuch@notmuchmail.org>; Sun, 26 May 2013 04:35:01 -0700 (PDT)
+Received: from guru.guru-group.fi (localhost [IPv6:::1])
+	by guru.guru-group.fi (Postfix) with ESMTP id 893E7100093;
+	Sun, 26 May 2013 14:34:57 +0300 (EEST)
+From: Tomi Ollila <tomi.ollila@iki.fi>
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org
+Subject: Re: [PATCH v2] build: fix out-of-tree builds
+In-Reply-To: <1369480738-16551-1-git-send-email-jani@nikula.org>
+References: <1368615519-25977-1-git-send-email-jani@nikula.org>
+	<1369480738-16551-1-git-send-email-jani@nikula.org>
+User-Agent: Notmuch/0.15.2+115~g12cf6af (http://notmuchmail.org) Emacs/24.3.1
+	(x86_64-unknown-linux-gnu)
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL
+	$[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F
+	!)g;OY^,BjTbr)Np:%c_o'jj,Z
+Date: Sun, 26 May 2013 14:34:57 +0300
+Message-ID: <m2txlqkm8u.fsf@guru.guru-group.fi>
+MIME-Version: 1.0
+Content-Type: text/plain
+X-BeenThere: notmuch@notmuchmail.org
+X-Mailman-Version: 2.1.13
+Precedence: list
+List-Id: "Use and development of the notmuch mail system."
+	<notmuch.notmuchmail.org>
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>
+List-Post: <mailto:notmuch@notmuchmail.org>
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
+	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
+X-List-Received-Date: Sun, 26 May 2013 11:35:14 -0000
+
+On Sat, May 25 2013, Jani Nikula <jani@nikula.org> wrote:
+
+> Support for out-of-tree builds was added in
+> commit 3e4a9d60a9419621b08c647a306843d76c47c2cb
+> Author: Carl Worth <cworth@cworth.org>
+> Date:   Wed Mar 9 15:02:42 2011 -0800
+>
+>     build: Add support for non-source-directory builds.
+>
+> and broken in
+> commit 7beeb8c88a014ecbc53d8241f10683b3c4c16228
+> Author: David Bremner <bremner@debian.org>
+> Date:   Sat Nov 17 12:28:15 2012 -0400
+>
+>     test: initial performance testing infrastructure
+>
+> Fix the build breakage.
+>
+> Out-of-tree 'make test' has been broken since earlier than the above,
+> and remains broken, as does out-of-tree perf test, but at least the
+> build now works.
+>
+> ---
+
+LGTM.
+
+Tomi
+
+
+>
+> I didn't have the time to dig into the test and perf test breakage.
+> ---
+>  Makefile                        |    7 ++++---
+>  performance-test/Makefile.local |    2 +-
+>  2 files changed, 5 insertions(+), 4 deletions(-)
+>
+> diff --git a/Makefile b/Makefile
+> index 73a8554..0428160 100644
+> --- a/Makefile
+> +++ b/Makefile
+> @@ -2,9 +2,10 @@
+>  # given explicitly on the command line) so mention it first.
+>  all:
+>  
+> -# List all subdirectories here. Each contains its own Makefile.local
+> -subdirs := compat completion emacs lib man parse-time-string
+> -subdirs += performance-test util test
+> +# List all subdirectories here. Each contains its own Makefile.local.
+> +# Use of '=', without '+=', seems to be required for out-of-tree
+> +# builds to work.
+> +subdirs = compat completion emacs lib man parse-time-string performance-test util test
+>  
+>  # We make all targets depend on the Makefiles themselves.
+>  global_deps = Makefile Makefile.config Makefile.local \
+> diff --git a/performance-test/Makefile.local b/performance-test/Makefile.local
+> index 73aa963..e47219a 100644
+> --- a/performance-test/Makefile.local
+> +++ b/performance-test/Makefile.local
+> @@ -2,7 +2,7 @@
+>  
+>  dir := performance-test
+>  
+> -include $(dir)/version.sh
+> +include $(srcdir)/$(dir)/version.sh
+>  
+>  TIME_TEST_SCRIPT := ${dir}/notmuch-time-test
+>  MEMORY_TEST_SCRIPT := ${dir}/notmuch-memory-test
+> -- 
+> 1.7.10.4
+>
+> _______________________________________________
+> notmuch mailing list
+> notmuch@notmuchmail.org
+> http://notmuchmail.org/mailman/listinfo/notmuch