[PATCH 2/5] build/ruby: make use of -Wl,--no-undefined configurable

diff --git a/90/b41b472e42f4eef787b5fb693adf071b7ea7f9 b/90/b41b472e42f4eef787b5fb693adf071b7ea7f9
new file mode 100644 (file)
index 0000000..318228e
--- /dev/null
+++ b/90/b41b472e42f4eef787b5fb693adf071b7ea7f9
@@ -0,0 +1,121 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id E91D3429E2E\r
+       for <notmuch@notmuchmail.org>; Thu,  1 Jan 2015 04:17:21 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id alBPRuaZkeXo for <notmuch@notmuchmail.org>;\r
+       Thu,  1 Jan 2015 04:17:21 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 97CBD429E29\r
+       for <notmuch@notmuchmail.org>; Thu,  1 Jan 2015 04:17:17 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+       id 1Y6egn-00054A-15; Thu, 01 Jan 2015 08:17:17 -0400\r
+Received: (nullmailer pid 28811 invoked by uid 1000); Thu, 01 Jan 2015\r
+       12:16:50 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/5] build/ruby: make use of -Wl,--no-undefined configurable\r
+Date: Thu,  1 Jan 2015 13:16:37 +0100\r
+Message-Id: <1420114600-28396-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.3\r
+In-Reply-To: <1420114600-28396-1-git-send-email-david@tethera.net>\r
+References: <1420114600-28396-1-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Thu, 01 Jan 2015 12:17:22 -0000\r
+\r
+In particular this is supposed to help build on systems (presumably\r
+using a non-gnu ld) where this flag is not available.\r
+---\r
+ bindings/Makefile.local  |  4 +++-\r
+ bindings/ruby/extconf.rb |  5 +++--\r
+ configure                | 13 +++++++++++++\r
+ 3 files changed, 19 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/bindings/Makefile.local b/bindings/Makefile.local\r
+index 6ed1344..210055f 100644\r
+--- a/bindings/Makefile.local\r
++++ b/bindings/Makefile.local\r
+@@ -5,7 +5,9 @@ dir := bindings\r
+ # force the shared library to be build\r
+ ruby-bindings: lib/libnotmuch.so\r
+ ifeq ($(HAVE_RUBY_DEV),1)\r
+-      cd $(dir)/ruby && ruby extconf.rb --vendor\r
++      cd $(dir)/ruby && \\r
++              EXTRA_LDFLAGS="$(NO_UNDEFINED_LDFLAGS)" \\r
++              ruby extconf.rb --vendor\r
+       $(MAKE) -C $(dir)/ruby\r
+ else\r
+       @echo Missing dependency, skipping ruby bindings\r
+diff --git a/bindings/ruby/extconf.rb b/bindings/ruby/extconf.rb\r
+index 6160db2..6d5607e 100644\r
+--- a/bindings/ruby/extconf.rb\r
++++ b/bindings/ruby/extconf.rb\r
+@@ -10,8 +10,9 @@ dir = File.join('..', '..', 'lib')\r
+ # includes\r
+ $INCFLAGS = "-I#{dir} #{$INCFLAGS}"\r
+ \r
+-# make sure there are no undefined symbols\r
+-$LDFLAGS += ' -Wl,--no-undefined'\r
++if ENV['EXTRA_LDFLAGS']\r
++  $LDFLAGS += " " + ENV['EXTRA_LDFLAGS']\r
++end\r
+ \r
+ def have_local_library(lib, path, func, headers = nil)\r
+   checking_for checking_message(func, lib) do\r
+diff --git a/configure b/configure\r
+index 7df3b29..1a4c956 100755\r
+--- a/configure\r
++++ b/configure\r
+@@ -712,6 +712,16 @@ else\r
+     as_needed_ldflags=""\r
+ fi\r
+ \r
++printf "Checking for -Wl,--no-undefined... "\r
++if ${CC} -Wl,--no-undefined -o minimal minimal.c >/dev/null 2>&1\r
++then\r
++    printf "Yes.\n"\r
++    no_undefined_ldflags="-Wl,--no-undefined"\r
++else\r
++    printf "No (nothing to worry about).\n"\r
++    no_undefined_ldflags=""\r
++fi\r
++\r
+ WARN_CXXFLAGS=""\r
+ printf "Checking for available C++ compiler warning flags... "\r
+ for flag in -Wall -Wextra -Wwrite-strings; do\r
+@@ -916,6 +926,9 @@ RPATH_LDFLAGS = ${rpath_ldflags}\r
+ # Flags needed to have linker link only to necessary libraries\r
+ AS_NEEDED_LDFLAGS = ${as_needed_ldflags}\r
+ \r
++# Flags to have the linker flag undefined symbols in object files\r
++NO_UNDEFINED_LDFLAGS = ${no_undefined_ldflags}\r
++\r
+ # Whether valgrind header files are available\r
+ HAVE_VALGRIND = ${have_valgrind}\r
+ \r
+-- \r
+2.1.3\r
+\r