remove GNU specific nm option from version script

diff --git a/e5/fa5c46d2cdb5103155d2250683faac2c8160c8 b/e5/fa5c46d2cdb5103155d2250683faac2c8160c8
new file mode 100644 (file)
index 0000000..d541a66
--- /dev/null
+++ b/e5/fa5c46d2cdb5103155d2250683faac2c8160c8
@@ -0,0 +1,88 @@
+Return-Path: <matthias.guedemann@googlemail.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 B52CD429E30\r
+       for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 02:20:33 -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 68dumh+HpzC1 for <notmuch@notmuchmail.org>;\r
+       Tue, 30 Aug 2011 02:20:33 -0700 (PDT)\r
+Received: from mail-bw0-f53.google.com (mail-bw0-f53.google.com\r
+       [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E97E2429E28\r
+       for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 02:20:32 -0700 (PDT)\r
+Received: by bkd1 with SMTP id 1so5399442bkd.26\r
+       for <notmuch@notmuchmail.org>; Tue, 30 Aug 2011 02:20:28 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=googlemail.com; s=gamma;\r
+       h=from:to:subject:user-agent:date:message-id:mime-version\r
+       :content-type; bh=mVqckSuurM/P+7ZMAjjb+5JEdtdsmDSyIwI9vIk6k1E=;\r
+       b=i3SVH10DZl6O3D7gH4yannDATgBh0xHVrseNSGbn7K8oH0YILKmssZwbEaCCdGH5kB\r
+       pb4YdavW0GA3sUxlnM31FsIKI7dFaCq8ydNO57kq04clogh9EfPi/+L97sVS3+J/4eeg\r
+       365W43yMcQOiBTk+BTFcpBcLQ5g6/sNGPiHMI=\r
+Received: by 10.204.140.89 with SMTP id h25mr2849942bku.321.1314696027922;\r
+       Tue, 30 Aug 2011 02:20:27 -0700 (PDT)\r
+Received: from localhost (pc44es141.cs.uni-magdeburg.de [141.44.32.169])\r
+       by mx.google.com with ESMTPS id s20sm1446255bka.53.2011.08.30.02.20.26\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 30 Aug 2011 02:20:27 -0700 (PDT)\r
+From: Matthias Guedemann <matthias.guedemann@googlemail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: remove GNU specific nm option from version script\r
+User-Agent: Notmuch/0.7-47-ga9e04d3 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 30 Aug 2011 11:20:26 +0200\r
+Message-ID: <8739gj2r39.fsf@pc44es141.cs.uni-magdeburg.de>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Tue, 30 Aug 2011 09:20:33 -0000\r
+\r
+hi all,\r
+\r
+I compiled notmuch on OpenBSD and stumbled onto the usage of the GNU\r
+specific option "--defined" to nm.\r
+\r
+I replaced this with calling nm without options and then filtering the\r
+output with grep\r
+\r
+tried on OpenBSD 5.0 -current and Debian on current git head\r
+\r
+regards\r
+Matthias\r
+\r
+\r
+\r
+diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh\r
+index ec80196..f71afec 100644\r
+--- a/lib/gen-version-script.sh\r
++++ b/lib/gen-version-script.sh\r
+@@ -12,7 +12,7 @@ HEADER=$1\r
+ shift\r
+ \r
+ printf '{\nglobal:\n'\r
+-nm --defined $* | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \\r
++nm $* | grep "^[0-f][0-f]*" | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \\r
+ while read sym; do\r
+     demangled=$(c++filt $sym)\r
+     case $demangled in\r