1 Return-Path: <polatel@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 3834C431FAE
\r
6 for <notmuch@notmuchmail.org>; Mon, 7 May 2012 08:03:42 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
10 X-Spam-Score: -0.699
\r
12 X-Spam-Status: No, score=-0.699 tagged_above=-999 required=5
\r
13 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001,
\r
14 RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
15 Received: from olra.theworths.org ([127.0.0.1])
\r
16 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id rQIq-nMgn5vA for <notmuch@notmuchmail.org>;
\r
18 Mon, 7 May 2012 08:03:41 -0700 (PDT)
\r
19 Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com
\r
20 [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
21 (No client certificate requested)
\r
22 by olra.theworths.org (Postfix) with ESMTPS id 8C320431FDC
\r
23 for <notmuch@notmuchmail.org>; Mon, 7 May 2012 08:03:40 -0700 (PDT)
\r
24 Received: by wibhn9 with SMTP id hn9so512021wib.2
\r
25 for <notmuch@notmuchmail.org>; Mon, 07 May 2012 08:03:39 -0700 (PDT)
\r
26 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
27 h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
\r
28 :references:in-reply-to:references:organization:mime-version
\r
29 :content-type:content-transfer-encoding;
\r
30 bh=+gllX4WTDJuFNWyXsE0YglJvaJrsISvNFUhZ9cuSM4g=;
\r
31 b=Tmbpsm59Zrlbl+sQXskRzCQ73QE/aRXM0t4pktCLsUGJ2Kra2LV/KzpdDGTDISmGwA
\r
32 +9P4rgvOF3KJkg/IrP9F8y39mdPW2KDYY+u4L3NTW2/78P/UxlW/Au+4oEBKIZ0eBbDR
\r
33 yAAwapEGqRSs7TPH07OhCiIVD+/GN4jwZo9ZsplMaYayK8Kfs2SSfHVF1jkmbswjm+NY
\r
34 EOo4ido6yzcQ09rpKIC0SQCPSP8FXAD9DpnJQO8h3p43tBawDPK2XvTXiEwa8I1ZKPJ+
\r
35 YmL7NclRiiHhh5nUKdePGAGKvubSgy5woG2Vj/or2E1CyJysioegcaOOpE/1bDZfKP1K
\r
37 Received: by 10.216.132.150 with SMTP id o22mr5248250wei.109.1336403019175;
\r
38 Mon, 07 May 2012 08:03:39 -0700 (PDT)
\r
39 Received: from hayalet.ev ([88.234.38.242])
\r
40 by mx.google.com with ESMTPS id ff2sm34852610wib.9.2012.05.07.08.03.38
\r
41 (version=TLSv1/SSLv3 cipher=OTHER);
\r
42 Mon, 07 May 2012 08:03:38 -0700 (PDT)
\r
43 Sender: Ali Polatel <polatel@gmail.com>
\r
44 From: Ali Polatel <alip@exherbo.org>
\r
45 To: David Bremner <bremner@unb.ca>
\r
47 [PATCH 3/4] ruby: Add workarounds to use in-tree build not the installed one
\r
48 Date: Mon, 7 May 2012 18:02:45 +0300
\r
50 <1559639bc5e9e3253f2ee2220a8d8d00c39d9d43.1336402558.git.alip@exherbo.org>
\r
51 X-Mailer: git-send-email 1.7.10.1
\r
52 In-Reply-To: <cover.1336402558.git.alip@exherbo.org>
\r
53 References: <87txzsgs4g.fsf@zancas.localnet>
\r
54 <cover.1336402558.git.alip@exherbo.org>
\r
55 In-Reply-To: <cover.1336402558.git.alip@exherbo.org>
\r
56 References: <cover.1336402558.git.alip@exherbo.org>
\r
57 Organization: Pink Floyd
\r
59 Content-Type: text/plain; charset=UTF-8
\r
60 Content-Transfer-Encoding: 8bit
\r
61 Cc: Ali Polatel <alip@exherbo.org>, notmuch@notmuchmail.org
\r
62 X-BeenThere: notmuch@notmuchmail.org
\r
63 X-Mailman-Version: 2.1.13
\r
65 List-Id: "Use and development of the notmuch mail system."
\r
66 <notmuch.notmuchmail.org>
\r
67 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
69 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
70 List-Post: <mailto:notmuch@notmuchmail.org>
\r
71 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
72 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
73 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
74 X-List-Received-Date: Mon, 07 May 2012 15:03:42 -0000
\r
76 - Make mkmf use the notmuch.h under ../../lib
\r
77 - Use libnotmuch.a instead of linking to the installed libnotmuch.so
\r
79 bindings/ruby/defs.h | 4 ++--
\r
80 bindings/ruby/extconf.rb | 26 ++++++++++++++++++++++----
\r
81 2 files changed, 24 insertions(+), 6 deletions(-)
\r
83 diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
\r
84 index a41cf10..6fe5787 100644
\r
85 --- a/bindings/ruby/defs.h
\r
86 +++ b/bindings/ruby/defs.h
\r
88 /* The Ruby interface to the notmuch mail library
\r
90 - * Copyright © 2010, 2011 Ali Polatel
\r
91 + * Copyright © 2010, 2011, 2012 Ali Polatel
\r
93 * This program is free software: you can redistribute it and/or modify
\r
94 * it under the terms of the GNU General Public License as published by
\r
99 -#include <notmuch.h>
\r
101 +#include "notmuch.h"
\r
103 VALUE notmuch_rb_cDatabase;
\r
104 VALUE notmuch_rb_cDirectory;
\r
105 diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
\r
106 index ccac609..933f34a 100644
\r
107 --- a/bindings/ruby/extconf.rb
\r
108 +++ b/bindings/ruby/extconf.rb
\r
110 #!/usr/bin/env ruby
\r
112 -# Copyright 2010, 2011 Ali Polatel <alip@exherbo.org>
\r
113 +# Copyright 2010, 2011, 2012 Ali Polatel <alip@exherbo.org>
\r
114 # Distributed under the terms of the GNU General Public License v3
\r
119 -find_header('notmuch.h', '../../lib')
\r
120 -find_library('notmuch', 'notmuch_database_create', '../../lib')
\r
121 +NOTDIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
\r
122 +NOTHDR = File.join(NOTDIR, 'notmuch.h')
\r
123 +NOTLIB = File.join(NOTDIR, 'libnotmuch.a')
\r
125 +unless File.exists? NOTHDR
\r
126 + $stderr.puts "notmuch.h is missing under #{NOTDIR}"
\r
130 +unless File.exists? NOTLIB
\r
131 + $stderr.puts "libnotmuch.a is missing under #{NOTDIR}"
\r
135 +# Small hack to build with in-tree version not the installed one.
\r
136 +# find_header() and friends use standard include/library paths first.
\r
137 +$stderr.puts "Added -I#{NOTDIR} to $INCFLAGS"
\r
138 +$INCFLAGS = "-I#{NOTDIR}".quote + " " + $INCFLAGS
\r
139 +find_header('notmuch.h', NOTDIR)
\r
141 +$LOCAL_LIBS += NOTLIB
\r
144 dir_config('notmuch')
\r