remove GNU specific nm option from version script

remove GNU specific nm option from version script

[Matthias Guedemann]

hi all,

I compiled notmuch on OpenBSD and stumbled onto the usage of the GNU
specific option "--defined" to nm.

I replaced this with calling nm without options and then filtering the
output with grep

tried on OpenBSD 5.0 -current and Debian on current git head

regards
Matthias



diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
index ec80196..f71afec 100644
--- a/lib/gen-version-script.sh
+++ b/lib/gen-version-script.sh
@@ -12,7 +12,7 @@ HEADER=$1
 shift
 
 printf '{\nglobal:\n'
-nm --defined $* | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
+nm $* | grep "^[0-f][0-f]*" | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
 while read sym; do
     demangled=$(c++filt $sym)
     case $demangled in

Patch formatting: (was: remove GNU specific nm option from version script)

[Tomi Ollila]

On Tue 30 Aug 2011 12:20, Matthias Guedemann <matthias.guedemann@googlemail.com> writes:

> hi all,
>
> I compiled notmuch on OpenBSD and stumbled onto the usage of the GNU
> specific option "--defined" to nm.
>
> I replaced this with calling nm without options and then filtering the
> output with grep
>
> tried on OpenBSD 5.0 -current and Debian on current git head

Maybe you should check how to "properly" format patches for the list.
For example. see:

http://notmuchmail.org/pipermail/notmuch/2011/005412.html

Note that after three '---' and before the 'diff git ..' the contents
are ignored by git am (or something), for an example, see:

http://notmuchmail.org/pipermail/notmuch/2011/005452.html

>
> regards
> Matthias

Tomi

PS: Maybe we should have just one page anyone can refer in
reply emails like this?

Re: Patch formatting: (was: remove GNU specific nm option from version script)

[David Bremner]

On Tue, 30 Aug 2011 14:04:03 +0300, Tomi Ollila <tomi.ollila@nixu.com> wrote:
> Maybe you should check how to "properly" format patches for the list.
> For example. see:
> 
> http://notmuchmail.org/pipermail/notmuch/2011/005412.html
> 

> PS: Maybe we should have just one page anyone can refer in
> reply emails like this?

Sure, feel free to add such a page to the notmuch wiki
(notmuchmail.org). Currently we have a link to the git project
guidelines, but it is really not completely appropriate.

d

Re: Patch formatting:

[Tomi Ollila]

On Tue 30 Aug 2011 14:24, David Bremner <david@tethera.net> writes:

> On Tue, 30 Aug 2011 14:04:03 +0300, Tomi Ollila <tomi.ollila@nixu.com> wrote:
>
>> PS: Maybe we should have just one page anyone can refer in
>> reply emails like this?
>
> Sure, feel free to add such a page to the notmuch wiki
> (notmuchmail.org). Currently we have a link to the git project
> guidelines, but it is really not completely appropriate.

I'll do !

>
> d
>

Tomi

Re: Patch formatting:

[Tomi Ollila]

On Tue 30 Aug 2011 16:04, Tomi Ollila <tomi.ollila@nixu.com> writes:

> On Tue 30 Aug 2011 14:24, David Bremner <david@tethera.net> writes:
>
>> On Tue, 30 Aug 2011 14:04:03 +0300, Tomi Ollila <tomi.ollila@nixu.com> wrote:
>>
>>> PS: Maybe we should have just one page anyone can refer in
>>> reply emails like this?
>>
>> Sure, feel free to add such a page to the notmuch wiki
>> (notmuchmail.org). Currently we have a link to the git project
>> guidelines, but it is really not completely appropriate.
>
> I'll do !

Check

http://notmuchmail.org/patchformatting/

>>
>> d
>>
>
> Tomi

Tomi

Re: Patch formatting:

[David Bremner]

On Tue, 30 Aug 2011 23:05:06 +0300, Tomi Ollila <tomi.ollila@nixu.com> wrote:
> 
> Check
> 
> http://notmuchmail.org/patchformatting/

Hi Tomi;

Thanks for doing this. I wonder if it would be less scare for newcomers
if we put the "Tips for..." first, since I guess almost everyone will
use git-format-patch ?

d

Re: Patch formatting:

[Austin Clements]

On Tue, Aug 30, 2011 at 4:33 PM, David Bremner <david@tethera.net> wrote:
> On Tue, 30 Aug 2011 23:05:06 +0300, Tomi Ollila <tomi.ollila@nixu.com> wrote:
>>
>> Check
>>
>> http://notmuchmail.org/patchformatting/
>
> Hi Tomi;
>
> Thanks for doing this. I wonder if it would be less scare for newcomers
> if we put the "Tips for..." first, since I guess almost everyone will
> use git-format-patch ?
>
> d

I would say start right off with git send-email, since it takes care
of every single formatting guideline and also makes it easy to send
entire patch series.  It seems like the most beginner-friendly way to
send patches, while at the same time serving power-patchers well.

Re: Patch formatting:

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 476 bytes --]

On Tue, 30 Aug 2011 21:22:15 -0400, Austin Clements <amdragon@mit.edu> wrote:
> I would say start right off with git send-email, since it takes care
> of every single formatting guideline and also makes it easy to send
> entire patch series.  It seems like the most beginner-friendly way to
> send patches, while at the same time serving power-patchers well.

Yeah, I'm not sure why/how that keeps getting lost.

Just use git send-email!  It takes care of everything.

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: Patch formatting:

[Tomi Ollila]

On Wed 31 Aug 2011 04:33, Jameson Graef Rollins <jrollins@finestructure.net> writes:

> On Tue, 30 Aug 2011 21:22:15 -0400, Austin Clements <amdragon@mit.edu> wrote:
>> I would say start right off with git send-email, since it takes care
>> of every single formatting guideline and also makes it easy to send
>> entire patch series.  It seems like the most beginner-friendly way to
>> send patches, while at the same time serving power-patchers well.
>
> Yeah, I'm not sure why/how that keeps getting lost.
>
> Just use git send-email!  It takes care of everything.

Ok I change the order to prefer send-email (and drop/modify "obsolete"
stuff).

I have to check git-send-email documentation as every shell on various
linuxes give me this:

$ git --version 
git version 1.7.3.4
$ git send-email  
git: 'send-email' is not a git command. See 'git --help'.

>
> jamie.

Thanks for comments,

Tomi

Re: Patch formatting:

[Tomi Ollila]

On Wed 31 Aug 2011 08:22, Tomi Ollila <tomi.ollila@iki.fi> writes:

> On Wed 31 Aug 2011 04:33, Jameson Graef Rollins
> <jrollins@finestructure.net> writes:

>> Yeah, I'm not sure why/how that keeps getting lost.
>>
>> Just use git send-email!  It takes care of everything.
>
> Ok I change the order to prefer send-email (and drop/modify "obsolete"
> stuff).
>
> I have to check git-send-email documentation as every shell on various
> linuxes give me this:
>
> $ git --version 
> git version 1.7.3.4
> $ git send-email  
> git: 'send-email' is not a git command. See 'git --help'.

$ yum search git | grep .-email
git-email.noarch : Git tools for sending email

$ apt-cache search git | grep .-email
git-email - fast, scalable, distributed revision control system (email add-on)

Maybe I start that 'git-email' is a separate package in
debian/ubuntu/fedora, and when compiling git from sources... you're
on your own; It requires a few perl modules possibly not installed by
default ;/

>>
>> jamie.
>
> Thanks for comments,
>
> Tomi

Tomi

removed "--defined" option from nm in gen-version-script.sh replaced functionality with grep

[Matthias Guedemann]

---
 lib/gen-version-script.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
index ec80196..f71afec 100644
--- a/lib/gen-version-script.sh
+++ b/lib/gen-version-script.sh
@@ -12,7 +12,7 @@ HEADER=$1
 shift
 
 printf '{\nglobal:\n'
-nm --defined $* | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
+nm $* | grep "^[0-f][0-f]*" | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
 while read sym; do
     demangled=$(c++filt $sym)
     case $demangled in
-- 
1.7.5.4

Re: removed "--defined" option from nm in gen-version-script.sh replaced functionality with grep

[David Bremner]

On Tue, 30 Aug 2011 14:46:14 +0200, Matthias Guedemann <matthias.guedemann@googlemail.com> wrote:

> -nm --defined $* | awk '$3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
> +nm $* | grep "^[0-f][0-f]*" | awk '$3 ~ "Xapian.*Error" {print $3}' |
> sort | un

As mentioned in the other thread, I pushed a modified version of
this. Just for the archives, patches for notmuch need a bit more
discussion in the commit message than the one line summary.

David