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