Re: zdohnal pushed to tests/vim (main). "upstream-unittests: Apply RPM workaround for package notes from Ruby (..more)"

[Mamoru TASAKA]

notifications(a)fedoraproject.org wrote on 2022/11/23 20:34:
>  Notification time stamped 2022-11-23 11:34:19 UTC
>  
>   From 1f016e5dedbb5bc7293c1638e1238989d6fabaa5 Mon Sep 17 00:00:00 2001
>  From: Zdenek Dohnal <zdohnal(a)redhat.com&gt;
>  Date: Nov 23 2022 11:30:01 +0000
>  Subject: upstream-unittests: Apply RPM workaround for package notes from Ruby
>  
>  
>  Vim adds Ruby LDFLAGS during configuration, which (due Ruby's decision
>  to embed flags from the building time) contains flags from buildsystem
>  environment, especially package notes. This flag expects additional
>  environment variables to be set and they aren't set in normal
>  environment.
>  
>  I've reported it to Vim upstream with PR which removes Ruby LDFLAGS from
>  configure script https://github.com/vim/vim/pull/11592 . 

And ruby (on rawhide for now) removed package_notes again because
currently non-rpmbuild build is broken with embedded package_notes flag:

https://src.fedoraproject.org/rpms/ruby/c/1d0c071aebd50621eb049a2ab8d20da...
https://bugzilla.redhat.com/show_bug.cgi?id=2142119
https://bugzilla.redhat.com/show_bug.cgi?id=2043092

Regards,
Mamoru

>  
>  ---
>  
>  diff --git a/Sanity/upstream-unittests/runtest.sh b/Sanity/upstream-unittests/runtest.sh
>  index 1919bd4..6f22812 100755
>  --- a/Sanity/upstream-unittests/runtest.sh
>  +++ b/Sanity/upstream-unittests/runtest.sh
>  @@ -70,6 +70,10 @@ rlJournalStart
>            rlRun "RUBY_CFLAGS='`ruby -r rbconfig -e "puts
> RbConfig::CONFIG['CFLAGS']"`'" 0 "Get ruby CFLAGS"
>            rlRun "export CFLAGS='$RUBY_CFLAGS'"                         
>                 0 "Set ruby CFLAGS"
>    
>  +        # newer redhat-rpm-config brings in packager-notes script, which breaks LDFLAGS
> we get from Ruby
>  +        # we need to set several env variable randomly to get configure working
> again...
>  +        rlRun "RPM_WORKAROUND='RPM_ARCH=\"x86_64\"
> RPM_PACKAGE_RELEASE=\"1\" RPM_PACKAGE_VERSION=\"1\"
> RPM_PACKAGE_NAME=\"vim\"'"
>  +
>            # show relevant info & ENV variables
>            rlLog "TEST:           $TEST"
>            rlLog "CONFOPT:        $CONFOPT"
>  @@ -85,8 +89,8 @@ rlJournalStart
>            rlRun "TERM=$TERM_type"
>    
>            # following block of code is taken from upstream travis.yml
>  -        rlRun "su $TESTER -c './configure ${CONFOPT} CFLAGS=\"${CFLAGS}
> $RUBY_FLAGS\"'" 0 "Configure Vim"
>  -        rlRun "su $TESTER -c 'make'" 0 "Build the binary which we
> substitute"
>  +        rlRun "su $TESTER -c './configure ${CONFOPT} CFLAGS=\"${CFLAGS}
> $RUBY_FLAGS\" $RPM_WORKAROUND'" 0 "Configure Vim"
>  +        rlRun "su $TESTER -c '$RPM_WORKAROUND make'" 0 "Build the
> binary which we substitute"
>            rlRun "su $TESTER -c 'ln -sf /usr/bin/vim  src/vim'"    0  
> "Create symlink to installed vim for testing"
>            rlRun "su $TESTER -c 'make ${TEST} |& tee output'" 0,2
> "Run tests (skip builtin terminal errors)"
>            _res_=$?
>  
>  
>
> 	https://src.fedoraproject.org/tests/vim/c/1f016e5dedbb5bc7293c1638e123898...
>  _______________________________________________
>  scm-commits mailing list -- scm-commits(a)lists.fedoraproject.org
>  To unsubscribe send an email to scm-commits-leave(a)lists.fedoraproject.org
>  Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
>  List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
>  List Archives:
> https://lists.fedoraproject.org/archives/list/[e-mail]...
>  Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue

zdohnal pushed to tests/vim (main). "upstream-unittests: Apply RPM workaround for package notes from Ruby (..more)"

[Zdenek Dohnal]

Thanks, Mamoru!

Looks like a race condition between me and Vita :D

Either way, I've tested whether Vim with Ruby interpreter can be built 
without Ruby's LDFLAGS and it worked fine, so I've sent a patch which 
removes Ruby's LDFLAGS from Vim. The patch was accepted, so hopefully I 
can avoid such errors in Vim in the future even without such workarounds.


Zdenek

On 11/23/22 13:20, Mamoru TASAKA wrote:
>  notifications(a)fedoraproject.org wrote on 2022/11/23 20:34:
> > Notification time stamped 2022-11-23 11:34:19 UTC
> >
> >  From 1f016e5dedbb5bc7293c1638e1238989d6fabaa5 Mon Sep 17 00:00:00 2001
> > From: Zdenek Dohnal <zdohnal(a)redhat.com&gt;
> > Date: Nov 23 2022 11:30:01 +0000
> > Subject: upstream-unittests: Apply RPM workaround for package notes 
> > from Ruby
> >
> >
> > Vim adds Ruby LDFLAGS during configuration, which (due Ruby's decision
> > to embed flags from the building time) contains flags from buildsystem
> > environment, especially package notes. This flag expects additional
> > environment variables to be set and they aren't set in normal
> > environment.
> >
> > I've reported it to Vim upstream with PR which removes Ruby LDFLAGS from
> > configure script https://github.com/vim/vim/pull/11592 .
>
>
>  And ruby (on rawhide for now) removed package_notes again because
>  currently non-rpmbuild build is broken with embedded package_notes flag:
>
>  https://src.fedoraproject.org/rpms/ruby/c/1d0c071aebd50621eb049a2ab8d20da... 
>
>  https://bugzilla.redhat.com/show_bug.cgi?id=2142119
>  https://bugzilla.redhat.com/show_bug.cgi?id=2043092
>
>  Regards,
>  Mamoru
>
> >
> > ---
> >
> > diff --git a/Sanity/upstream-unittests/runtest.sh 
> > b/Sanity/upstream-unittests/runtest.sh
> > index 1919bd4..6f22812 100755
> > --- a/Sanity/upstream-unittests/runtest.sh
> > +++ b/Sanity/upstream-unittests/runtest.sh
> > @@ -70,6 +70,10 @@ rlJournalStart
> >           rlRun "RUBY_CFLAGS='`ruby -r rbconfig -e "puts 
> > RbConfig::CONFIG['CFLAGS']"`'" 0 "Get ruby CFLAGS"
> >           rlRun "export CFLAGS='$RUBY_CFLAGS'" 0 "Set ruby
> CFLAGS"
> >   +        # newer redhat-rpm-config brings in packager-notes script, 
> > which breaks LDFLAGS we get from Ruby
> > +        # we need to set several env variable randomly to get 
> > configure working again...
> > +        rlRun "RPM_WORKAROUND='RPM_ARCH=\"x86_64\" 
> > RPM_PACKAGE_RELEASE=\"1\" RPM_PACKAGE_VERSION=\"1\" 
> > RPM_PACKAGE_NAME=\"vim\"'"
> > +
> >           # show relevant info & ENV variables
> >           rlLog "TEST:           $TEST"
> >           rlLog "CONFOPT:        $CONFOPT"
> > @@ -85,8 +89,8 @@ rlJournalStart
> >           rlRun "TERM=$TERM_type"
> >             # following block of code is taken from upstream travis.yml
> > -        rlRun "su $TESTER -c './configure ${CONFOPT} 
> > CFLAGS=\"${CFLAGS} $RUBY_FLAGS\"'" 0 "Configure Vim"
> > -        rlRun "su $TESTER -c 'make'" 0 "Build the binary
> which we 
> > substitute"
> > +        rlRun "su $TESTER -c './configure ${CONFOPT} 
> > CFLAGS=\"${CFLAGS} $RUBY_FLAGS\" $RPM_WORKAROUND'" 0
> "Configure Vim"
> > +        rlRun "su $TESTER -c '$RPM_WORKAROUND make'" 0 "Build
> the 
> > binary which we substitute"
> >           rlRun "su $TESTER -c 'ln -sf /usr/bin/vim src/vim'"   
> 0   
> > "Create symlink to installed vim for testing"
> >           rlRun "su $TESTER -c 'make ${TEST} |& tee output'"
> 0,2 "Run 
> > tests (skip builtin terminal errors)"
> >           _res_=$?
> >
> >
> >
>     https://src.fedoraproject.org/tests/vim/c/1f016e5dedbb5bc7293c1638e1238989d6fabaa5?branch=main
>
> >
> > _______________________________________________
> > scm-commits mailing list -- scm-commits(a)lists.fedoraproject.org
> > To unsubscribe send an email to 
> > scm-commits-leave(a)lists.fedoraproject.org
> > Fedora Code of Conduct: 
> > https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> > List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> > List Archives: 
> > https://lists.fedoraproject.org/archives/list/[e-mail]...
> > Do not reply to spam, report it: 
> > https://pagure.io/fedora-infrastructure/new_issue
>  
-- 
Zdenek Dohnal
Software Engineer
Red Hat, BRQ-TPBC