RE: RE: s390 lsbsi diffs

> It's kind of a manual process. Roughly speaking, the
> process should be something like this:
>
> 1. Try to patch a clean glibc + glibc-linuxthreads
> (ignoring completely the nALFS xml for this) for s390,
> not applying any of the other LSB or architecture patches.
> 2. if that patches cleanly, make ANOTHER glibc 2.2.5
> tree, and apply the patches that the nALFS xml will
> apply (again, I'd do this by hand)
> 3. If we now have two clean trees, we can diff them
> and try to see if there are any conflicts. They should
> be almost completely disjoint, but since the 390 patches
> didn't apply, I'm not sure I believe that any longer.
>
> I'm willing to take a pass at this and report back.

This is what I envisioned. Sure if you have the time to take a look at this
let me know what you find. I started looking at this a bit and some of the
failures, at least on the first attempt I tried by hand, are because some
files are not found where it says they are in the patch file. Example:
glibc-2.2.5/sysdeps/s390/bits/byteswap.h is actually under two directories.
glibc-2.2.5/sysdeps/s390/s390-32/bits/byteswap.h and glibc-2.2.5
/sysdeps/s390/s390-64/bits/byteswap.h.


>  By the way, I checked the IBM page you referenced and
> it doesn't list five patches, just one.  From your
> original mail:
>       To create the complete glibc sources, the following patches need
> to be applied
>       in sequence:
>
>       glibc-2.2.5.tar.gz (see www.gnu.org/software/libc)
>
>       + glibc-linuxthreads-2.2.5.tar.gz (see www.gnu.org/software/libc)>
>
>       + glibc-2.2.5-s390-may2002.diff (IBM)
>
>       + glibc-2.2.5-s390-1-may2002.diff (IBM)
>
>       + glibc-2.2.5-s390-2-may2002.diff (IBM)
>
>       + glibc-2.2.5-s390-3-may2002.diff (IBM)
>
> But I see this:
>            To create the complete glibc sources, the following patches
need
> to be applied          in sequence:
>
>            glibc-2.2.5.tar.gz (see www.gnu.org/software/libc)
>            + glibc-linuxthreads-2.2.5.tar.gz (see
> www.gnu.org/software/libc)
>            + glibc-2.2.5-s390-may2002.diff (IBM)
>
> And when I download the patch, it indeed only contains a
> single diff file.

You probably are seeing the 2002-05-31 tool chain for the "May 2002
stream". I was talking about the glibc 2.2.5 ("May 2002",2002-09-13) stream
which has the four patches listed. The patches are downloaded from
different places on the page. Following are the attachments for them:
(See attached file: glibc-2.2.5-s390-3-may2002.tar.gz)(See attached file:
glibc-2.2.5-s390-2-may2002.tar.gz)(See attached file:
glibc-2.2.5-s390-1-may2002.tar.gz)(See attached file:
glibc-2.2.5-s390-may2002.tar.gz)

> This is an odd situation because glibc isn't
> built in the bootstrap phase, it's constructed
> at the beginning of the intermediate phase
> and thus using the built bootstrap.  That implies
> that the bootstrap didn't get built correctly,
> for whatever reason.  Since there was some
> back-and-forth trying to get other stuff to
> work, I'd suggest just getting rid of the built
> tree completely and starting the build over.

This is a good idea. I'll do that. I'll also try to save the output of the
build this time in case there is a warning or error along the way so I we
can back track.

Thanks Mats you've been very helpful.

Regards,
Eliuth