[packages/rpm] - x32 patch fixes

Jan Palus atler at pld-linux.org
Tue Mar 23 15:53:06 CET 2021


On 23.03.2021 14:44, Jan Rękorajski wrote:
> On Tue, Mar 23, 2021 at 1:59 PM Jan Palus <atler at pld-linux.org> wrote:
> 
> > On 23.03.2021 08:53, baggins wrote:
> > > commit b10d9d9e984edbf3157c9fee959c0868486a2f93
> > > Author: Jan Rękorajski <baggins at pld-linux.org>
> > > Date:   Tue Mar 23 08:52:27 2021 +0100
> > >
> > >     - x32 patch fixes
> > >
> > >  x32.patch | 10 +++-------
> > >  1 file changed, 3 insertions(+), 7 deletions(-)
> > > ---
> > > diff --git a/x32.patch b/x32.patch
> > > index 38aa140..f7ab616 100644
> > > --- a/x32.patch
> > > +++ b/x32.patch
> > > -@@ -190,10 +201,14 @@
> > > -   # skip architectures for which we dont have full config parameters
> > > -   [ -z "$CANONARCH" ] && continue
> > > -
> > > --  if [ "$OS" = "linux" ] && [ "$CANONCOLOR" = 3 ]; then
> > > -+  if [ "$OS" = "linux" ] && [ "$CANONARCH" = "x86_64" ]; then
> > > +@@ -190,6 +201,10 @@
> > >         LIB=${LIB}64
> > >     fi
> >
> > This hunk should either be brought back or CANONCOLOR for x86_64 should
> > be reverted to 3 (it is still 7). Current end result on x86_64 is _lib=lib.
> >
> 
> Can you restore this hunk and rebuild rpm? I can't do it till evening :(
> 
> It should probably even be 'if [ "$OS" = "linux" ] && [ "$CANONARCH" =
> "x86_64"] || [ "$CANONCOLOR" = 3 ]; then'

Done. Looks like everything is back to normal.


More information about the pld-devel-en mailing list