From: Mike Kelly <pioto@pioto.org>
Date: Wed, 30 May 2012 07:01:57 +0000 (+2000)
Subject: [PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for symbol-test
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dc41a9146c0f51d70d3123091610fb7fcabd5d15;p=notmuch-archives.git

[PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for symbol-test
---

diff --git a/41/bccc82376e60611d03f48cea1f03eca6e237c9 b/41/bccc82376e60611d03f48cea1f03eca6e237c9
new file mode 100644
index 000000000..8ad7904bc
--- /dev/null
+++ b/41/bccc82376e60611d03f48cea1f03eca6e237c9
@@ -0,0 +1,91 @@
+Return-Path: <pioto@pioto.org>
+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 CF059431FC7
+	for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:55 -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 WF3mqqd6Vh40 for <notmuch@notmuchmail.org>;
+	Wed, 30 May 2012 00:02:55 -0700 (PDT)
+Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com
+	[209.85.212.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
+	(No client certificate requested)
+	by olra.theworths.org (Postfix) with ESMTPS id DFF9A431FAF
+	for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:54 -0700 (PDT)
+Received: by vbbfc26 with SMTP id fc26so4786695vbb.26
+	for <notmuch@notmuchmail.org>; Wed, 30 May 2012 00:02:54 -0700 (PDT)
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+	d=google.com; s=20120113;
+	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
+	:x-gm-message-state;
+	bh=s84hMjSJve4oswCmrc+wMuDiJfZ5ENc4YAAF+VKDqps=;
+	b=WILmiNrGwBA6RaZDrSLbSbiUAmCFhCGe/1vJqS4fMsiKfrpSboRstrjQse/Xvml/op
+	cVrzbTLxafTFtuj8ISUaeTGHeNkCwTfiaivbSvKJnLbMMDTbbRzmh9srO29KTUamoxUN
+	qcWtUC6bXVDp05WXFC0BH9qpSf4Ywc7IoWcWoZoJBdQjxV7nMmzBx0UWcbYeVn0YFSFH
+	MKiqXbhRH8O3GFsA/jX50N6oipRCIvheoRZ/kdfLra+mKmB8j4Y+OEm5mds6utd6Aj6/
+	psTYdteuxPpQ/95YXUtLNAbaPzMmd9T0NLzE440tsD9fMuOEKeSAi5bDT4oOvvaTunxI
+	fyhQ==
+Received: by 10.220.241.135 with SMTP id le7mr16013238vcb.63.1338361374178;
+	Wed, 30 May 2012 00:02:54 -0700 (PDT)
+Received: from nas.home.pioto.org (pool-71-182-155-97.pitbpa.fios.verizon.net.
+	[71.182.155.97])
+	by mx.google.com with ESMTPS id by3sm28311820vdc.17.2012.05.30.00.02.53
+	(version=TLSv1/SSLv3 cipher=OTHER);
+	Wed, 30 May 2012 00:02:53 -0700 (PDT)
+Received: by nas.home.pioto.org (Postfix, from userid 1001)
+	id BECD4287E0; Wed, 30 May 2012 03:02:51 -0400 (EDT)
+From: Mike Kelly <pioto@pioto.org>
+To: notmuch@notmuchmail.org
+Subject: [PATCH v2 2/9] test/Makefile.local: Use $(XAPIAN_LDFLAGS) for
+	symbol-test
+Date: Wed, 30 May 2012 03:01:57 -0400
+Message-Id: <1338361324-57289-3-git-send-email-pioto@pioto.org>
+X-Mailer: git-send-email 1.7.10.2
+In-Reply-To: <1338361324-57289-1-git-send-email-pioto@pioto.org>
+References: <1338361324-57289-1-git-send-email-pioto@pioto.org>
+X-Gm-Message-State:
+ ALoCoQkVyBt9ftvRRVcxhY3eZvkyh429bmhiZ3blvdpHfIBSlE/sE7uTRJZSTsy9BMpnKdONl7Es
+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: Wed, 30 May 2012 07:02:56 -0000
+
+On FreeBSD, and probably anywhere else someone installed xapian to
+some other prefix, we need to use XAPIAN_LDFLAGS to make the linker can
+actually find libxapian.
+---
+ test/Makefile.local |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile.local b/test/Makefile.local
+index 4a6a4b1..c071aee 100644
+--- a/test/Makefile.local
++++ b/test/Makefile.local
+@@ -17,7 +17,7 @@ $(dir)/smtp-dummy: $(smtp_dummy_modules)
+ 	$(call quiet,CC) $^ -o $@
+ 
+ $(dir)/symbol-test: $(dir)/symbol-test.o
+-	$(call quiet,CXX) $^ -o $@ -Llib -lnotmuch -lxapian
++	$(call quiet,CXX) $^ -o $@ -Llib -lnotmuch $(XAPIAN_LDFLAGS)
+ 
+ .PHONY: test check
+ 
+-- 
+1.7.10.2
+