[PATCH] Revert "rt-tests: Makefile: ctags: Change obsolete extra to extras"

[PATCH] Revert "rt-tests: Makefile: ctags: Change obsolete extra to extras"

[Mathias Krause]

Commit 974241c78a6f ("rt-tests: Makefile: ctags: Change obsolete extra to
extras") not only broke the generation of tags files -- at least for exuberant
ctags version 5.9 as shipped in Debian -- but it also added -Wextra to CFLAGS,
leading to many warnings.

Simply revert the commit to undo the unintended change and unbreak ctags file
generation.

Signed-off-by: Mathias Krause <minipli@grsecurity.net>
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 32a9f41198a4..3b9e90d528e5 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ prefix  ?= /usr/local
 bindir  ?= $(prefix)/bin
 mandir	?= $(prefix)/share/man
 
-CFLAGS ?= -Wall -Wno-nonnull -Wextra
+CFLAGS ?= -Wall -Wno-nonnull
 CPPFLAGS += -D_GNU_SOURCE -Isrc/include
 LDFLAGS ?=
 
@@ -253,4 +253,4 @@ help:
 
 .PHONY: tags
 tags:
-	ctags -R --extras=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
+	ctags -R --extra=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
-- 
2.30.2

Re: [PATCH] Revert "rt-tests: Makefile: ctags: Change obsolete extra to extras"

[Mathias Krause]

On 26.09.23 13:04, Mathias Krause wrote:
> Commit 974241c78a6f ("rt-tests: Makefile: ctags: Change obsolete extra to
> extras") not only broke the generation of tags files -- at least for exuberant
> ctags version 5.9 as shipped in Debian -- but it also added -Wextra to CFLAGS,
> leading to many warnings.
> 
> Simply revert the commit to undo the unintended change and unbreak ctags file
> generation.
> 
> Signed-off-by: Mathias Krause <minipli@grsecurity.net>
> ---
>  Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index 32a9f41198a4..3b9e90d528e5 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -30,7 +30,7 @@ prefix  ?= /usr/local
>  bindir  ?= $(prefix)/bin
>  mandir	?= $(prefix)/share/man
>  
> -CFLAGS ?= -Wall -Wno-nonnull -Wextra
> +CFLAGS ?= -Wall -Wno-nonnull
>  CPPFLAGS += -D_GNU_SOURCE -Isrc/include
>  LDFLAGS ?=
>  
> @@ -253,4 +253,4 @@ help:
>  
>  .PHONY: tags
>  tags:
> -	ctags -R --extras=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
> +	ctags -R --extra=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *


Ping?

Can this be merged to fix ctags, at least?:

minipli@bell:~/src/upstream/rt-tests ((v2.6))$ make tags
ctags -R --extras=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
ctags: Unknown option: --extras
make: *** [Makefile:256: tags] Fehler 1
minipli@bell:~/src/upstream/rt-tests ((v2.6))$ ctags --version
Exuberant Ctags 5.9~svn20110310, Copyright (C) 1996-2009 Darren Hiebert
  Addresses: <dhiebert@users.sourceforge.net>, http://ctags.sourceforge.net
  Optional compiled features: +wildcards, +regex

Thanks,
Mathias

Re: [PATCH] Revert "rt-tests: Makefile: ctags: Change obsolete extra to extras"

[John Kacur]

On Wed, 18 Oct 2023, Mathias Krause wrote:

> On 26.09.23 13:04, Mathias Krause wrote:
> > Commit 974241c78a6f ("rt-tests: Makefile: ctags: Change obsolete extra to
> > extras") not only broke the generation of tags files -- at least for exuberant
> > ctags version 5.9 as shipped in Debian -- but it also added -Wextra to CFLAGS,
> > leading to many warnings.
> > 
> > Simply revert the commit to undo the unintended change and unbreak ctags file
> > generation.
> > 
> > Signed-off-by: Mathias Krause <minipli@grsecurity.net>
> > ---
> >  Makefile | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index 32a9f41198a4..3b9e90d528e5 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -30,7 +30,7 @@ prefix  ?= /usr/local
> >  bindir  ?= $(prefix)/bin
> >  mandir	?= $(prefix)/share/man
> >  
> > -CFLAGS ?= -Wall -Wno-nonnull -Wextra
> > +CFLAGS ?= -Wall -Wno-nonnull
> >  CPPFLAGS += -D_GNU_SOURCE -Isrc/include
> >  LDFLAGS ?=
> >  
> > @@ -253,4 +253,4 @@ help:
> >  
> >  .PHONY: tags
> >  tags:
> > -	ctags -R --extras=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
> > +	ctags -R --extra=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
> 
> 
> Ping?
> 
> Can this be merged to fix ctags, at least?:

Sorry, but the problem is that Debian is using an 
old version of ctags. You can either just edit the Makefile to build on 
Debian, or compile a more modern version of ctags by hand, I'm sure there 
are some other solutions as well.

As for the warnings, we want to see those. People including myself have 
sent in patches to fix the cause of the warnings, but simply hiding them
isn't the solution.

Thanks

John

Re: [PATCH] Revert "rt-tests: Makefile: ctags: Change obsolete extra to extras"

[Mathias Krause]

On 18.10.23 16:03, John Kacur wrote:
> On Wed, 18 Oct 2023, Mathias Krause wrote:
>> On 26.09.23 13:04, Mathias Krause wrote:
>>> Commit 974241c78a6f ("rt-tests: Makefile: ctags: Change obsolete extra to
>>> extras") not only broke the generation of tags files -- at least for exuberant
>>> ctags version 5.9 as shipped in Debian -- but it also added -Wextra to CFLAGS,
>>> leading to many warnings.
>>>
>>> Simply revert the commit to undo the unintended change and unbreak ctags file
>>> generation.
>>>
>>> Signed-off-by: Mathias Krause <minipli@grsecurity.net>
>>> ---
>>>  Makefile | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 32a9f41198a4..3b9e90d528e5 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -30,7 +30,7 @@ prefix  ?= /usr/local
>>>  bindir  ?= $(prefix)/bin
>>>  mandir	?= $(prefix)/share/man
>>>  
>>> -CFLAGS ?= -Wall -Wno-nonnull -Wextra
>>> +CFLAGS ?= -Wall -Wno-nonnull
>>>  CPPFLAGS += -D_GNU_SOURCE -Isrc/include
>>>  LDFLAGS ?=
>>>  
>>> @@ -253,4 +253,4 @@ help:
>>>  
>>>  .PHONY: tags
>>>  tags:
>>> -	ctags -R --extras=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
>>> +	ctags -R --extra=+f --c-kinds=+p --exclude=tmp --exclude=BUILD *
>>
>>
>> Ping?
>>
>> Can this be merged to fix ctags, at least?:
> 
> Sorry, but the problem is that Debian is using an 
> old version of ctags. You can either just edit the Makefile to build on 
> Debian, or compile a more modern version of ctags by hand, I'm sure there 
> are some other solutions as well.

Ah, I see. It's an incompatibility between Exuberant and Universal
Ctags. I'll sent a patch restoring support for the former in a moment.

> 
> As for the warnings, we want to see those. People including myself have 
> sent in patches to fix the cause of the warnings, but simply hiding them
> isn't the solution.

I see. I just noticed that ctags broke on me, dug up the offending
commit and saw the unintended(?, at least unmentioned) change to CFLAGS.
But fair enough, I'll leave it to you to fix up the warnings ;)

Thanks,
Mathias