Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id C57746DE0948 for ; Sat, 13 Jun 2015 23:27:45 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.195 X-Spam-Level: X-Spam-Status: No, score=0.195 tagged_above=-999 required=5 tests=[AWL=0.185, T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uSFKLDFKMw_r for ; Sat, 13 Jun 2015 23:27:44 -0700 (PDT) Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net [87.98.215.224]) by arlo.cworth.org (Postfix) with ESMTPS id 186706DE0350 for ; Sat, 13 Jun 2015 23:27:44 -0700 (PDT) Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim 4.80) (envelope-from ) id 1Z41Nm-0002mD-0G; Sun, 14 Jun 2015 06:27:02 +0000 Received: (nullmailer pid 14219 invoked by uid 1000); Sun, 14 Jun 2015 06:26:43 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [PATCH] build/ruby: use notmuch configure script values for shared lib Date: Sun, 14 Jun 2015 08:26:31 +0200 Message-Id: <1434263191-14171-1-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433142542-2307-4-git-send-email-david@tethera.net> References: <1433142542-2307-4-git-send-email-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.18 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: Sun, 14 Jun 2015 06:27:45 -0000 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 | 3 ++- bindings/ruby/extconf.rb | 13 +++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/bindings/Makefile.local b/bindings/Makefile.local index d236f01..4ecf839 100644 --- a/bindings/Makefile.local +++ b/bindings/Makefile.local @@ -3,10 +3,11 @@ dir := bindings # force the shared library to be built -ruby-bindings: lib/libnotmuch.so +ruby-bindings: lib/$(LINKER_NAME) 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