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 097116DE1995 for ; Mon, 1 Jun 2015 00:10:37 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: 0.266 X-Spam-Level: X-Spam-Status: No, score=0.266 tagged_above=-999 required=5 tests=[AWL=0.256, 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 RArrMa5Sh8_X for ; Mon, 1 Jun 2015 00:10:35 -0700 (PDT) Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net [87.98.215.224]) by arlo.cworth.org (Postfix) with ESMTPS id 44E056DE1640 for ; Mon, 1 Jun 2015 00:10:35 -0700 (PDT) Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim 4.80) (envelope-from ) id 1YzJqx-0007O7-UD; Mon, 01 Jun 2015 07:09:43 +0000 Received: (nullmailer pid 2453 invoked by uid 1000); Mon, 01 Jun 2015 07:09:06 -0000 From: David Bremner To: David Bremner , notmuch@notmuchmail.org Subject: [patch v3 3/4] build/ruby: use notmuch configure script values for shared lib Date: Mon, 1 Jun 2015 09:09:01 +0200 Message-Id: <1433142542-2307-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1433142542-2307-1-git-send-email-david@tethera.net> References: <1425679073-30439-5-git-send-email-david@tethera.net> <1433142542-2307-1-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: Mon, 01 Jun 2015 07:10:37 -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 | 1 + bindings/ruby/extconf.rb | 13 +++---------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/bindings/Makefile.local b/bindings/Makefile.local index 2ad0b86..8b1ff83 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