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 F401B431FD2 for ; Fri, 6 Mar 2015 13:59:36 -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 AQhpaw6y13ZN for ; Fri, 6 Mar 2015 13:59:35 -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 6D772431FCF for ; Fri, 6 Mar 2015 13:59:31 -0800 (PST) Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim 4.80) (envelope-from ) id 1YU0Gg-0000RV-B4; Fri, 06 Mar 2015 21:58:50 +0000 Received: (nullmailer pid 30537 invoked by uid 1000); Fri, 06 Mar 2015 21:57:57 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [Patch v2 2/4] build/ruby: make use of -Wl,--no-undefined configurable Date: Fri, 6 Mar 2015 22:57:51 +0100 Message-Id: <1425679073-30439-3-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:38 -0000 In particular this is supposed to help build on systems (presumably using a non-gnu ld) where this flag is not available. --- bindings/Makefile.local | 4 +++- bindings/ruby/extconf.rb | 5 +++-- configure | 13 +++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/bindings/Makefile.local b/bindings/Makefile.local index 6ed1344..210055f 100644 --- a/bindings/Makefile.local +++ b/bindings/Makefile.local @@ -5,7 +5,9 @@ dir := bindings # force the shared library to be build ruby-bindings: lib/libnotmuch.so ifeq ($(HAVE_RUBY_DEV),1) - cd $(dir)/ruby && ruby extconf.rb --vendor + cd $(dir)/ruby && \ + EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \ + ruby extconf.rb --vendor $(MAKE) -C $(dir)/ruby else @echo Missing dependency, skipping ruby bindings diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb index 6160db2..6d5607e 100644 --- a/bindings/ruby/extconf.rb +++ b/bindings/ruby/extconf.rb @@ -10,8 +10,9 @@ dir = File.join('..', '..', 'lib') # includes $INCFLAGS = "-I#{dir} #{$INCFLAGS}" -# make sure there are no undefined symbols -$LDFLAGS += ' -Wl,--no-undefined' +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 diff --git a/configure b/configure index 3ca9bed..409bb60 100755 --- a/configure +++ b/configure @@ -722,6 +722,16 @@ else as_needed_ldflags="" fi +printf "Checking for -Wl,--no-undefined... " +if ${CC} -Wl,--no-undefined -o minimal minimal.c >/dev/null 2>&1 +then + printf "Yes.\n" + no_undefined_ldflags="-Wl,--no-undefined" +else + printf "No (nothing to worry about).\n" + no_undefined_ldflags="" +fi + WARN_CXXFLAGS="" printf "Checking for available C++ compiler warning flags... " for flag in -Wall -Wextra -Wwrite-strings; do @@ -926,6 +936,9 @@ RPATH_LDFLAGS = ${rpath_ldflags} # Flags needed to have linker link only to necessary libraries AS_NEEDED_LDFLAGS = ${as_needed_ldflags} +# Flags to have the linker flag undefined symbols in object files +NO_UNDEFINED_LDFLAGS = ${no_undefined_ldflags} + # Whether valgrind header files are available HAVE_VALGRIND = ${have_valgrind} -- 2.1.4