[PATCH] libnotmuch: only build symbols list after the modules are built

diff --git a/fe/49f5b6316cf0fb62ad39e1812e9552d94be62f b/fe/49f5b6316cf0fb62ad39e1812e9552d94be62f
new file mode 100644 (file)
index 0000000..7a44e86
--- /dev/null
+++ b/fe/49f5b6316cf0fb62ad39e1812e9552d94be62f
@@ -0,0 +1,87 @@
+Return-Path: <schnouki@schnouki.net>\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 218E7431FD0\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Jul 2011 16:32:06 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1]\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 xIwM9Los7Pai for <notmuch@notmuchmail.org>;\r
+       Wed, 20 Jul 2011 16:32:04 -0700 (PDT)\r
+Received: from ks3536.kimsufi.com (schnouki.net [87.98.217.222])\r
+       by olra.theworths.org (Postfix) with ESMTP id 108FF431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Jul 2011 16:32:04 -0700 (PDT)\r
+Received: from localhost.localdomain (nancy.schnouki.net [78.238.0.45])\r
+       by ks3536.kimsufi.com (Postfix) with ESMTPSA id 988B46A06A9;\r
+       Thu, 21 Jul 2011 01:40:51 +0200 (CEST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=schnouki.net;\r
+       s=key-schnouki; t=1311205251;\r
+       bh=AzOY3XC9Y/8DQNfUKd52GRUXKZJxgw6VulNPhWr91HI=;\r
+       h=From:To:Subject:Date:Message-Id:In-Reply-To:References;\r
+       b=KMBBMAeF8qi+BOuqN77US6WsD9Be8H2cLAq05srep4oltLCZNigwI/P5h21QvUr1/\r
+       XQOJV6Ur/vuOHyjtnykyBImm3fQsQGkzMSfzfWZGJqqgDekPlr2DgUeulnNkQLAfnr\r
+       IrC8J1bHT4bBFeLNM3hOLidaBTF+f1p94xY67xN4=\r
+From: Thomas Jost <schnouki@schnouki.net>\r
+To: David Bremner <david@tethera.net>,\r
+       notmuch@notmuchmail.org\r
+Subject: [PATCH] libnotmuch: only build symbols list after the modules are\r
+       built\r
+Date: Thu, 21 Jul 2011 01:31:37 +0200\r
+Message-Id: <1311204697-14701-1-git-send-email-schnouki@schnouki.net>\r
+X-Mailer: git-send-email 1.7.6\r
+In-Reply-To: <87aac8ev8z.fsf@convex-new.cs.unb.ca>\r
+References: <87aac8ev8z.fsf@convex-new.cs.unb.ca>\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: Wed, 20 Jul 2011 23:32:06 -0000\r
+\r
+If the notmuch.sym target does not explicitly depend on $(libnotmuch_modules),\r
+gen-version-script.sh may be run before all the .o files are created, for\r
+example when doing a parallel build on a machine with many cores.\r
+---\r
+Hi David,\r
+\r
+Here's an updated version of the patch with a shorter commit message.\r
+\r
+For the record, the build log I sent earlier was obtained on my work PC, which\r
+has two 8-core CPUs. No problem on my laptop with its dual-core CPU though :)\r
+\r
+Regards,\r
+Thomas\r
+\r
+ lib/Makefile.local |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/lib/Makefile.local b/lib/Makefile.local\r
+index 9210f0e..fbc2f6a 100644\r
+--- a/lib/Makefile.local\r
++++ b/lib/Makefile.local\r
+@@ -74,7 +74,7 @@ $(dir)/libnotmuch.a: $(libnotmuch_modules)\r
+ $(dir)/$(LIBNAME): $(libnotmuch_modules) notmuch.sym\r
+       $(call quiet,CXX $(CXXFLAGS)) $(libnotmuch_modules) $(FINAL_LIBNOTMUCH_LDFLAGS) $(LIBRARY_LINK_FLAG) -o $@\r
+ \r
+-notmuch.sym: lib/notmuch.h\r
++notmuch.sym: lib/notmuch.h $(libnotmuch_modules)\r
+       sh lib/gen-version-script.sh $< $(libnotmuch_modules) > $@\r
+ \r
+ $(dir)/$(SONAME): $(dir)/$(LIBNAME)\r
+-- \r
+1.7.6\r
+\r