Re: [packages/rpm-pld-macros] - fix typo in debugsource packages macro - rel 2
On Thu, 01 Apr 2021, Elan Ruusamäe wrote:
>
> On 01.04.2021 10:02, Bartek Szady wrote:
> >
> > Well...
> >
> > rpm --define '_debugsource_packages 0' --eval
> > '%{?%_debugsource_packages:%_debugsource_template}'
> >
> > worked as I had expected (it evaluated to nothing) not because
> > %_debugsource_packages was evaluated to false but because
> > %{%_debugsource_packages} was undefined :-(
> >
> >
> > Is there any way to undefine a macro in .rpmmacros ?
Disabling _debugsource_packages should work with rpm-pld-macros 2.005.
--
Jan Rękorajski| PLD/Linux
SysAdm | bagginspld-linux.org | http://www.pld-linux.org/
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
Re: [packages/rpm-pld-macros] - fix typo in debugsource packages macro - rel 2
On 01.04.2021 10:02, Bartek Szady wrote:
Well...
rpm --define '_debugsource_packages 0' --eval
'%{?%_debugsource_packages:%_debugsource_template}'
worked as I had expected (it evaluated to nothing) not because
%_debugsource_packages was evaluated to false but because
%{%_debugsource_packages} was undefined :-(
Is there any way to undefine a macro in .rpmmacros ?
you can't use the inline compare with it: %{?foo:xxx}
but you can use this trickery:
1. create variable _foo_bar_%{baz}
2. check for _foo_bar_1
2. nuke _foo_bar_%{baz}
$ grep -r dic /usr/lib/rpm
/usr/lib/rpm/pld/macros:%debuginfocflags %{expand:%%define
__dic_%{?_enable_debug_packages} 1}%{?__dic_1: -gdwarf-4
-fno-debug-types-section -fvar-tracking-assignments
-g2}%{expand:%%undefine __dic_%{?_enable_debug_packages}}
/usr/lib/rpm/pld/macros:%_build_id_links %{expand:%%define
__dic_%{?_enable_debug_packages}
1}%{?__dic_1:compat}%{?__dic_0:none}%{expand:%%undefine
__dic_%{?_enable_debug_packages}}
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
Re: [packages/rpm-pld-macros] - fix typo in debugsource packages macro - rel 2
On 3/31/21 9:51 PM, Jan Rękorajski wrote:
> On Wed, 31 Mar 2021, Jakub Bogusz wrote:
>
>> On Wed, Mar 31, 2021 at 09:33:00PM +0200, baggins wrote:
>>> commit 45c4eb111b114539bab16bd567a4a794d75d6e16
>>> Author: Jan Rękorajski
>>> Date: Wed Mar 31 21:32:32 2021 +0200
>>>
>>> - fix typo in debugsource packages macro
>>> - rel 2
>>>
>>> macros.pld | 2 +-
>>> rpm-pld-macros.spec | 2 +-
>>> 2 files changed, 2 insertions(+), 2 deletions(-)
>>> ---
>> [...]
>>> @@ -138,7 +138,7 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
>>> %ifnarch noarch\
>>> %global __debug_package 1\
>>> %_debuginfo_template\
>>> -%{?_debugsource_packages:%_debugsource_template}\
>>> +%{?%_debugsource_packages:%_debugsource_template}\
>>> %endif\
>>> %{nil}
>>>
>> Uhm, is it really correct now?
>> debug source files like these are unpackaged now:
>>
>> /usr/src/debug/gjs-1.68.0-1.x32
> It's not, Reverted.
Well...
rpm --define '_debugsource_packages 0' --eval
'%{?%_debugsource_packages:%_debugsource_template}'
worked as I had expected (it evaluated to nothing) not because
%_debugsource_packages was evaluated to false but because
%{%_debugsource_packages} was undefined :-(
Is there any way to undefine a macro in .rpmmacros ?
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
Re: [packages/rpm-pld-macros] - fix typo in debugsource packages macro - rel 2
On Wed, 31 Mar 2021, Jakub Bogusz wrote:
> On Wed, Mar 31, 2021 at 09:33:00PM +0200, baggins wrote:
> > commit 45c4eb111b114539bab16bd567a4a794d75d6e16
> > Author: Jan Rękorajski
> > Date: Wed Mar 31 21:32:32 2021 +0200
> >
> > - fix typo in debugsource packages macro
> > - rel 2
> >
> > macros.pld | 2 +-
> > rpm-pld-macros.spec | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> > ---
> [...]
> > @@ -138,7 +138,7 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
> > %ifnarch noarch\
> > %global __debug_package 1\
> > %_debuginfo_template\
> > -%{?_debugsource_packages:%_debugsource_template}\
> > +%{?%_debugsource_packages:%_debugsource_template}\
> > %endif\
> > %{nil}
> >
>
> Uhm, is it really correct now?
> debug source files like these are unpackaged now:
>
> /usr/src/debug/gjs-1.68.0-1.x32
It's not, Reverted.
--
Jan Rękorajski| PLD/Linux
SysAdm | bagginspld-linux.org | http://www.pld-linux.org/
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
Re: [packages/rpm-pld-macros] - fix typo in debugsource packages macro - rel 2
On Wed, Mar 31, 2021 at 09:33:00PM +0200, baggins wrote:
> commit 45c4eb111b114539bab16bd567a4a794d75d6e16
> Author: Jan Rękorajski
> Date: Wed Mar 31 21:32:32 2021 +0200
>
> - fix typo in debugsource packages macro
> - rel 2
>
> macros.pld | 2 +-
> rpm-pld-macros.spec | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
> ---
[...]
> @@ -138,7 +138,7 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
> %ifnarch noarch\
> %global __debug_package 1\
> %_debuginfo_template\
> -%{?_debugsource_packages:%_debugsource_template}\
> +%{?%_debugsource_packages:%_debugsource_template}\
> %endif\
> %{nil}
>
Uhm, is it really correct now?
debug source files like these are unpackaged now:
/usr/src/debug/gjs-1.68.0-1.x32
...
--
Jakub Boguszhttp://qboosh.pl/
___
pld-devel-en mailing list
pld-devel-en@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
