[PATCH] build: fix order of rpath

diff --git a/a4/9c7517d2aef40d49d5e503f6b974d618c711c8 b/a4/9c7517d2aef40d49d5e503f6b974d618c711c8
new file mode 100644 (file)
index 0000000..16c265e
--- /dev/null
+++ b/a4/9c7517d2aef40d49d5e503f6b974d618c711c8
@@ -0,0 +1,108 @@
+Return-Path: <felipe.contreras@gmail.com>\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 47D9E431FC0\r
+       for <notmuch@notmuchmail.org>; Sun, 11 May 2014 19:22:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 QoZwpnjjfHVn for <notmuch@notmuchmail.org>;\r
+       Sun, 11 May 2014 19:22:34 -0700 (PDT)\r
+Received: from mail-ob0-f172.google.com (mail-ob0-f172.google.com\r
+       [209.85.214.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 49E1A431FBF\r
+       for <notmuch@notmuchmail.org>; Sun, 11 May 2014 19:22:34 -0700 (PDT)\r
+Received: by mail-ob0-f172.google.com with SMTP id wp18so7498693obc.31\r
+       for <notmuch@notmuchmail.org>; Sun, 11 May 2014 19:22:33 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id;\r
+       bh=x/3j+tgnrNYOinyG6CFq6so6Nn1s90XOU/iMBnoE3SU=;\r
+       b=Fvb4RkamttcodU94tsYrrilWuQyI3tQEFqXYBqFDznotI6JzPZUBKw514x43SXLT5b\r
+       BWcimJDcNSs95ywsdG8bq+GIx5XRwwcpjw2aM7hyyeYRJMWwizAY++ZHjVJncVNAp1MH\r
+       cdcS51SQ4HLBkXTNeUchDVgBxONislAtJxzbdOF6VDkoGIJQbYlY9eKjDffL9qOo6LYh\r
+       L0/EoDb2jEpcB12OSEq1QEdDsMqdtEoVUxGTgtSrFkx6c++MsueJOJEBJK7n8cpJTho4\r
+       Cs55xSIuViHGI8E++MfM2lJCu302jEMi5zT7IYQM94nNQtWddfHx1tttTidKI76OuPy5\r
+       xhOA==\r
+X-Received: by 10.60.76.233 with SMTP id n9mr21573362oew.50.1399861353721;\r
+       Sun, 11 May 2014 19:22:33 -0700 (PDT)\r
+Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])\r
+       by mx.google.com with ESMTPSA id vh3sm17688606obb.9.2014.05.11.19.22.31\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+       Sun, 11 May 2014 19:22:32 -0700 (PDT)\r
+From: Felipe Contreras <felipe.contreras@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] build: fix order of rpath\r
+Date: Sun, 11 May 2014 21:22:25 -0500\r
+Message-Id: <1399861345-25397-1-git-send-email-felipe.contreras@gmail.com>\r
+X-Mailer: git-send-email 1.9.2+fc1~45~g3953d93\r
+Cc: Moritz Wilhelmy <moritz+git@wzff.de>\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: Mon, 12 May 2014 02:22:40 -0000\r
+\r
+In my system `pkg-config --libs talloc` returns\r
+'Wl,-rpath,/usr/lib -ltalloc' (probably wrongly) which causes the final\r
+LDFLAGS to be something like '-Wl,-rpath,/usr/lib\r
+-Wl,-rpath,/opt/notmuch/lib', which causes the RUNPATH to be\r
+'/usr/lib:/opt/notmuch/lib', so basically defeating the whole purpose of\r
+RUNPATH.\r
+\r
+I noticed this when my /opt/notmuch/bin/notmuch (0.17) started updating\r
+the database after I updated the system (which updated the system's\r
+notmuch). This shouldn't happen.\r
+\r
+Let's move the RUNPATH flags before other external flags have a chance of\r
+screwing the build.\r
+\r
+Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>\r
+---\r
+ Makefile.local | 9 +++++----\r
+ 1 file changed, 5 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index fa07d81..af79b5c 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -46,15 +46,16 @@ PV_FILE=bindings/python/notmuch/version.py\r
+ # Smash together user's values with our extra values\r
+ FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)\r
+ FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)\r
+-FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS)\r
++FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch\r
++ifeq ($(LIBDIR_IN_LDCONFIG),0)\r
++FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)\r
++endif\r
++FINAL_NOTMUCH_LDFLAGS += $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS)\r
+ FINAL_NOTMUCH_LINKER = CC\r
+ ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)\r
+ FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)\r
+ FINAL_NOTMUCH_LINKER = CXX\r
+ endif\r
+-ifeq ($(LIBDIR_IN_LDCONFIG),0)\r
+-FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)\r
+-endif\r
+ FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS)\r
+ \r
+ .PHONY: all\r
+-- \r
+1.9.2+fc1~45~g3953d93\r
+\r