Return-Path: 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 862A2431FBF for ; Fri, 6 Mar 2015 13:59:46 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 2.438 X-Spam-Level: ** X-Spam-Status: No, score=2.438 tagged_above=-999 required=5 tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 0JS0a3yMsIIx for ; Fri, 6 Mar 2015 13:59:44 -0800 (PST) Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net [87.98.215.224]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id A8295431FAE for ; Fri, 6 Mar 2015 13:59:44 -0800 (PST) Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim 4.80) (envelope-from ) id 1YU0Gt-0000Rf-Ks; Fri, 06 Mar 2015 21:59:03 +0000 Received: (nullmailer pid 30539 invoked by uid 1000); Fri, 06 Mar 2015 21:57:57 -0000 From: David Bremner 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 Message-Id: <1425679073-30439-4-git-send-email-david@tethera.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1425679073-30439-1-git-send-email-david@tethera.net> References: <1420114600-28396-6-git-send-email-david@tethera.net> <1425679073-30439-1-git-send-email-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 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: Fri, 06 Mar 2015 21:59:46 -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 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