Re: [PATCH] build: fix order of rpath

diff --git a/10/0c2e1f1dbd89b99e9afce5de7b54648e24f6bb b/10/0c2e1f1dbd89b99e9afce5de7b54648e24f6bb
new file mode 100644 (file)
index 0000000..3fbd024
--- /dev/null
+++ b/10/0c2e1f1dbd89b99e9afce5de7b54648e24f6bb
@@ -0,0 +1,110 @@
+Return-Path: <tomi.ollila@iki.fi>\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 0D4F9431FC7\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 11:02:20 -0700 (PDT)\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 QLYHjzkY+Xs7 for <notmuch@notmuchmail.org>;\r
+       Mon, 12 May 2014 11:02:16 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id A7963431FC2\r
+       for <notmuch@notmuchmail.org>; Mon, 12 May 2014 11:02:16 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 04CEA100051;\r
+       Mon, 12 May 2014 21:02:08 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Felipe Contreras <felipe.contreras@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH] build: fix order of rpath\r
+In-Reply-To: <1399861345-25397-1-git-send-email-felipe.contreras@gmail.com>\r
+References: <1399861345-25397-1-git-send-email-felipe.contreras@gmail.com>\r
+User-Agent: Notmuch/0.18+11~gb21401f (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Mon, 12 May 2014 21:02:07 +0300\r
+Message-ID: <m2oaz2zxi8.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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 18:02:20 -0000\r
+\r
+On Mon, May 12 2014, Felipe Contreras <felipe.contreras@gmail.com> wrote:\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
+\r
+LGTM. Works for me (i.e. did not break my RPATH setting for notmuch-shared binary.\r
+\r
+Tomi\r
+\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
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r