1 Return-Path: <felipe.contreras@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 47D9E431FC0
\r
6 for <notmuch@notmuchmail.org>; Sun, 11 May 2014 19:22:40 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id QoZwpnjjfHVn for <notmuch@notmuchmail.org>;
\r
17 Sun, 11 May 2014 19:22:34 -0700 (PDT)
\r
18 Received: from mail-ob0-f172.google.com (mail-ob0-f172.google.com
\r
19 [209.85.214.172]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id 49E1A431FBF
\r
22 for <notmuch@notmuchmail.org>; Sun, 11 May 2014 19:22:34 -0700 (PDT)
\r
23 Received: by mail-ob0-f172.google.com with SMTP id wp18so7498693obc.31
\r
24 for <notmuch@notmuchmail.org>; Sun, 11 May 2014 19:22:33 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=from:to:cc:subject:date:message-id;
\r
27 bh=x/3j+tgnrNYOinyG6CFq6so6Nn1s90XOU/iMBnoE3SU=;
\r
28 b=Fvb4RkamttcodU94tsYrrilWuQyI3tQEFqXYBqFDznotI6JzPZUBKw514x43SXLT5b
\r
29 BWcimJDcNSs95ywsdG8bq+GIx5XRwwcpjw2aM7hyyeYRJMWwizAY++ZHjVJncVNAp1MH
\r
30 cdcS51SQ4HLBkXTNeUchDVgBxONislAtJxzbdOF6VDkoGIJQbYlY9eKjDffL9qOo6LYh
\r
31 L0/EoDb2jEpcB12OSEq1QEdDsMqdtEoVUxGTgtSrFkx6c++MsueJOJEBJK7n8cpJTho4
\r
32 Cs55xSIuViHGI8E++MfM2lJCu302jEMi5zT7IYQM94nNQtWddfHx1tttTidKI76OuPy5
\r
34 X-Received: by 10.60.76.233 with SMTP id n9mr21573362oew.50.1399861353721;
\r
35 Sun, 11 May 2014 19:22:33 -0700 (PDT)
\r
36 Received: from localhost (189-211-224-40.static.axtel.net. [189.211.224.40])
\r
37 by mx.google.com with ESMTPSA id vh3sm17688606obb.9.2014.05.11.19.22.31
\r
38 for <multiple recipients>
\r
39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
\r
40 Sun, 11 May 2014 19:22:32 -0700 (PDT)
\r
41 From: Felipe Contreras <felipe.contreras@gmail.com>
\r
42 To: notmuch@notmuchmail.org
\r
43 Subject: [PATCH] build: fix order of rpath
\r
44 Date: Sun, 11 May 2014 21:22:25 -0500
\r
45 Message-Id: <1399861345-25397-1-git-send-email-felipe.contreras@gmail.com>
\r
46 X-Mailer: git-send-email 1.9.2+fc1~45~g3953d93
\r
47 Cc: Moritz Wilhelmy <moritz+git@wzff.de>
\r
48 X-BeenThere: notmuch@notmuchmail.org
\r
49 X-Mailman-Version: 2.1.13
\r
51 List-Id: "Use and development of the notmuch mail system."
\r
52 <notmuch.notmuchmail.org>
\r
53 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
55 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
56 List-Post: <mailto:notmuch@notmuchmail.org>
\r
57 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
58 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
59 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
60 X-List-Received-Date: Mon, 12 May 2014 02:22:40 -0000
\r
62 In my system `pkg-config --libs talloc` returns
\r
63 'Wl,-rpath,/usr/lib -ltalloc' (probably wrongly) which causes the final
\r
64 LDFLAGS to be something like '-Wl,-rpath,/usr/lib
\r
65 -Wl,-rpath,/opt/notmuch/lib', which causes the RUNPATH to be
\r
66 '/usr/lib:/opt/notmuch/lib', so basically defeating the whole purpose of
\r
69 I noticed this when my /opt/notmuch/bin/notmuch (0.17) started updating
\r
70 the database after I updated the system (which updated the system's
\r
71 notmuch). This shouldn't happen.
\r
73 Let's move the RUNPATH flags before other external flags have a chance of
\r
76 Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
\r
78 Makefile.local | 9 +++++----
\r
79 1 file changed, 5 insertions(+), 4 deletions(-)
\r
81 diff --git a/Makefile.local b/Makefile.local
\r
82 index fa07d81..af79b5c 100644
\r
83 --- a/Makefile.local
\r
84 +++ b/Makefile.local
\r
85 @@ -46,15 +46,16 @@ PV_FILE=bindings/python/notmuch/version.py
\r
86 # Smash together user's values with our extra values
\r
87 FINAL_CFLAGS = -DNOTMUCH_VERSION=$(VERSION) $(CPPFLAGS) $(CFLAGS) $(WARN_CFLAGS) $(extra_cflags) $(CONFIGURE_CFLAGS)
\r
88 FINAL_CXXFLAGS = $(CPPFLAGS) $(CXXFLAGS) $(WARN_CXXFLAGS) $(extra_cflags) $(extra_cxxflags) $(CONFIGURE_CXXFLAGS)
\r
89 -FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS)
\r
90 +FINAL_NOTMUCH_LDFLAGS = $(LDFLAGS) -Lutil -lutil -Llib -lnotmuch
\r
91 +ifeq ($(LIBDIR_IN_LDCONFIG),0)
\r
92 +FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
\r
94 +FINAL_NOTMUCH_LDFLAGS += $(AS_NEEDED_LDFLAGS) $(GMIME_LDFLAGS) $(TALLOC_LDFLAGS) $(ZLIB_LDFLAGS)
\r
95 FINAL_NOTMUCH_LINKER = CC
\r
96 ifneq ($(LINKER_RESOLVES_LIBRARY_DEPENDENCIES),1)
\r
97 FINAL_NOTMUCH_LDFLAGS += $(CONFIGURE_LDFLAGS)
\r
98 FINAL_NOTMUCH_LINKER = CXX
\r
100 -ifeq ($(LIBDIR_IN_LDCONFIG),0)
\r
101 -FINAL_NOTMUCH_LDFLAGS += $(RPATH_LDFLAGS)
\r
103 FINAL_LIBNOTMUCH_LDFLAGS = $(LDFLAGS) $(AS_NEEDED_LDFLAGS) $(CONFIGURE_LDFLAGS)
\r
107 1.9.2+fc1~45~g3953d93
\r