From f04a49edaaaa2ba1a06c9141c3880a9bd9e93408 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 1 Jun 2015 09:09:00 +0200 Subject: [PATCH] [patch v3 2/4] build/ruby: make use of -Wl,--no-undefined configurable --- 54/8e04950d1ca6f8717b071899a04f59fb3b551d | 122 ++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 54/8e04950d1ca6f8717b071899a04f59fb3b551d diff --git a/54/8e04950d1ca6f8717b071899a04f59fb3b551d b/54/8e04950d1ca6f8717b071899a04f59fb3b551d new file mode 100644 index 000000000..5d957ebc6 --- /dev/null +++ b/54/8e04950d1ca6f8717b071899a04f59fb3b551d @@ -0,0 +1,122 @@ +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 8AD986DE19A8 + for ; Mon, 1 Jun 2015 00:10:51 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0.264 +X-Spam-Level: +X-Spam-Status: No, score=0.264 tagged_above=-999 required=5 tests=[AWL=0.254, + 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 1laJSDmfLMC4 for ; + Mon, 1 Jun 2015 00:10:50 -0700 (PDT) +Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net + [87.98.215.224]) + by arlo.cworth.org (Postfix) with ESMTPS id D13786DE1774 + for ; Mon, 1 Jun 2015 00:10:49 -0700 (PDT) +Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim + 4.80) (envelope-from ) + id 1YzJrL-0007OH-MK; Mon, 01 Jun 2015 07:10:07 +0000 +Received: (nullmailer pid 2451 invoked by uid 1000); Mon, 01 Jun 2015 + 07:09:06 -0000 +From: David Bremner +To: David Bremner , notmuch@notmuchmail.org +Subject: [patch v3 2/4] build/ruby: make use of -Wl,--no-undefined + configurable +Date: Mon, 1 Jun 2015 09:09:00 +0200 +Message-Id: <1433142542-2307-3-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:51 -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 e0b0bf0..2ad0b86 100644 +--- a/bindings/Makefile.local ++++ b/bindings/Makefile.local +@@ -5,7 +5,9 @@ dir := bindings + # force the shared library to be built + 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 5a862b1..e3b4902 100755 +--- a/configure ++++ b/configure +@@ -750,6 +750,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 +@@ -954,6 +964,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 + -- 2.26.2