unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org
Subject: [Patch v2 3/4] build/ruby: use notmuch configure script values for shared lib
Date: Fri,  6 Mar 2015 22:57:52 +0100	[thread overview]
Message-ID: <1425679073-30439-4-git-send-email-david@tethera.net> (raw)
In-Reply-To: <1425679073-30439-1-git-send-email-david@tethera.net>

This is supposed to help build on systems like MacOS with different
conventions for naming shared libraries. We have already computed the
relevant names, so doing it again in ruby seems like a bad idea.
---
 bindings/Makefile.local  |  1 +
 bindings/ruby/extconf.rb | 13 +++----------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/bindings/Makefile.local b/bindings/Makefile.local
index 210055f..4d86e59 100644
--- a/bindings/Makefile.local
+++ b/bindings/Makefile.local
@@ -7,6 +7,7 @@ ruby-bindings: lib/libnotmuch.so
 ifeq ($(HAVE_RUBY_DEV),1)
 	cd $(dir)/ruby && \
 		EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \
+		LIBNOTMUCH="../../lib/$(LINKER_NAME)" \
 		ruby extconf.rb --vendor
 	$(MAKE) -C $(dir)/ruby
 else
diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb
index 6d5607e..ddaa684 100644
--- a/bindings/ruby/extconf.rb
+++ b/bindings/ruby/extconf.rb
@@ -14,19 +14,12 @@ if ENV['EXTRA_LDFLAGS']
   $LDFLAGS += " " + ENV['EXTRA_LDFLAGS']
 end
 
-def have_local_library(lib, path, func, headers = nil)
-  checking_for checking_message(func, lib) do
-    lib = File.join(path, lib)
-    if try_func(func, lib, headers)
-      $LOCAL_LIBS += lib
-    end
-  end
-end
-
-if not have_local_library('libnotmuch.so', dir, 'notmuch_database_create', 'notmuch.h')
+if not ENV['LIBNOTMUCH']
   exit 1
 end
 
+$LOCAL_LIBS += ENV['LIBNOTMUCH']
+
 # Create Makefile
 dir_config('notmuch')
 create_makefile('notmuch')
-- 
2.1.4

  parent reply	other threads:[~2015-03-06 21:59 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-01 12:16 Build and test ruby bindings David Bremner
2015-01-01 12:16 ` [PATCH 1/5] build: integrate building ruby bindings into notmuch build process David Bremner
2015-01-01 12:16 ` [PATCH 2/5] build/ruby: make use of -Wl,--no-undefined configurable David Bremner
2015-01-01 12:16 ` [PATCH 3/5] bindings/ruby: gitignore *.o David Bremner
2015-01-01 15:53   ` David Bremner
2015-01-01 12:16 ` [PATCH 4/5] build/ruby: use notmuch configure script values for shared lib David Bremner
2015-01-01 12:16 ` [PATCH 5/5] test: add initial ruby tests David Bremner
2015-03-06 21:57   ` integrate ruby into build and test v2 David Bremner
2015-03-06 21:57     ` [Patch v2 1/4] build: integrate building ruby bindings into notmuch build process David Bremner
2015-03-06 21:57     ` [Patch v2 2/4] build/ruby: make use of -Wl,--no-undefined configurable David Bremner
2015-03-06 21:57     ` David Bremner [this message]
2015-03-06 21:57     ` [Patch v2 4/4] test: add initial ruby tests David Bremner
2015-06-01  7:08       ` Build ruby bindings: round 3 David Bremner
2015-06-01  7:08         ` [patch v3 1/4] build: integrate building ruby bindings into notmuch build process David Bremner
2015-06-13  6:37           ` David Bremner
2015-06-13 19:59             ` Jinwoo Lee
2015-06-13 20:46               ` Jinwoo Lee
2015-06-13 20:51                 ` Jinwoo Lee
2015-06-13 21:11                   ` David Bremner
2015-06-13 21:22                     ` Jinwoo Lee
2015-06-13 21:24                       ` Jinwoo Lee
2015-06-13 21:34                         ` Jinwoo Lee
2015-06-14  5:49                           ` David Bremner
2015-06-15  6:35             ` David Bremner
2015-06-01  7:09         ` [patch v3 2/4] build/ruby: make use of -Wl,--no-undefined configurable David Bremner
2015-06-14  5:58           ` [PATCH] lib, ruby: " David Bremner
2015-06-14  6:20             ` Jinwoo Lee
2015-06-14  6:53               ` David Bremner
2015-06-14 15:16                 ` Jinwoo Lee
2015-06-14 18:34                   ` David Bremner
2015-06-15  3:56                     ` Jinwoo Lee
2015-06-15  9:20                       ` Tomi Ollila
2015-06-15 21:49                         ` Jinwoo Lee
2015-06-16 18:20                           ` Tomi Ollila
2015-06-16 23:43                             ` Jinwoo Lee
2015-06-17  0:15                               ` Jinwoo Lee
2015-06-17  6:23                               ` David Bremner
2015-06-17  6:39                                 ` Jinwoo Lee
2015-06-17 11:16                                 ` Tomi Ollila
2015-06-01  7:09         ` [patch v3 3/4] build/ruby: use notmuch configure script values for shared lib David Bremner
2015-06-14  6:26           ` [PATCH] " David Bremner
2015-06-01  7:09         ` [patch v3 4/4] test: add initial ruby tests David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425679073-30439-4-git-send-email-david@tethera.net \
    --to=david@tethera.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).