RE: s390 lsbsi diffs
Eliuth Pomar <[email protected]> Fri, 25 Apr 2003 14:36:48 -0400
| Newsgroups | gmane.linux.lsb.implementation |
|---|---|
| Message-ID | <[email protected]> |
> IS there a glibc s390 patch that needs to be applied?
> If so, please forward so we can check it in.
I did some research and it seems like there is a set of patches for 390.
Perhaps some people on copy here may be able to shed some light into
this...
Looks like there is a set of patches to be applied on s390 for glibc 2.2.5.
for the 2.4.19 kernel according to the following web page:
http://oss.software.ibm.com/developerworks/opensource/linux390/current2_4_19-may2002.shtml#glibc20020531
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)
I tried applying the patches consecutively with the
./phase2/package-build/glibc.xml. However, the make failed while applying
the frist patch. I tried to apply the patches individually and the only one
that works was glibc-2.2.5-s390-3-may2002.diff. I'm thinking that perhaps
the patches are already applied with the code that I have... I'm not really
sure. Some of the information I got is that these patches are supposed to
work on a vanilla glibc 2.2.5 and glibc.xml applies some patches before any
arch specific patches are applied.
At any rate this is the entry I now have on entities/package:
<!ENTITY glibc-s390-3-patch "glibc-2.2.5-s390-3-may2002.diff">
This is what I now have on ./phase2/package-build/glibc.xml
<patch>
<base>&build_dir;/&glibc-directory;</base>
<param>-N</param>
<param>-p1</param>
<param>--verbose</param>
<param>-i
&packages_dir;/&glibc-s390-3-patch;</param>
</patch>
Following is the attached patch file:
(See attached file: glibc-2.2.5-s390-3-may2002.diff)
My suggestion is to wait and see if someone can clarify why I couldn't
apply the other patches cleanly. All I know is that I got a lot of "Uhm...
The next patch looks like a unified diff to me..." when I tried to apply
them and I placed the - - verbose option.
My suggestion is probably prudent since my next error is the following:
-: patching file sysvipc/sys/shm.h
I: Executing system command in /:
I: touch /etc/ld.so.conf
I: Searching Makefile (/usr/src/glibc-2.2.5/malloc)
I: for "$(PERL)"
I: and replacing with "/usr/bin/perl".
I: Made 3 changes.
I: Searching Makefile (/usr/src/glibc-2.2.5/login)
I: for "root"
I: and replacing with "0".
I: Made 2 changes.
I: Searching shlib-versions (/usr/src/glibc-2.2.5)
I: for "ld.so.1"
I: and replacing with "ld-lsb-s390.so.1".
I: Made 4 changes.
I: Searching ldconfig.h (/usr/src/glibc-2.2.5
/sysdeps/unix/sysv/linux/s390)
I: for "ld.so.1"
I: and replacing with "ld-lsb-s390.so.1".
I: Made 1 change.
I: Executing in /usr/src/glibc-build:
I: ../glibc-2.2.5/configure --prefix=/usr --infodir=/usr/share/info
--enable-add-ons --libexecdir=/usr/bin
-: loading cache ./config.cache
-: checking host system type... s390-ibm-linux-gnu
-: checking sysdep dirs... sysdeps/s390/s390-32/elf
linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32
linuxthreads/sysdeps/unix/sysv/linux/s390
linuxthreads/sysdeps/unix/sysv/linux linuxthreads/sysdeps/pthread
sysdeps/pthread linuxthreads/sysdeps/unix/sysv
linuxthreads/sysdeps/unix linuxthreads/sysdeps/s390/s390-32
linuxthreads/sysdeps/s390 sysdeps/unix/sysv/linux/s390/s390-32
sysdeps/unix/sysv/linux/s390 sysdeps/unix/sysv/linux sysdeps/gnu
sysdeps/unix/common sysdeps/unix/mman sysdeps/unix/inet
sysdeps/unix/sysv sysdeps/unix sysdeps/posix sysdeps/s390/s390-32
sysdeps/wordsize-32 sysdeps/ieee754 sysdeps/ieee754/dbl-64
sysdeps/ieee754/flt-32 sysdeps/s390/fpu sysdeps/s390
sysdeps/generic/elf sysdeps/generic
-: checking for a BSD compatible install... /bin/install -c
-: checking whether ln -s works... yes
-: checking for pwd... /bin/pwd
-: checking build system type... s390-ibm-linux-gnu
-: checking for gcc... gcc
-: checking version of gcc... v. ?.??, bad
-: checking for gnumake... no
-: checking for gmake... no
-: checking for make... make
-: checking version of make... 3.80, ok
-: configure: error:
-: *** These critical programs are missing or too old:gcc
-: *** Check the INSTALL file for required versions.
I: Log file stored in "/root/.nALFS/packages/glibc-2.2.5.log".
E: Execution failed (1).
I: Executing for 00:08:15, total 00:08:15.
On this one I'm kind of clueless as to why this is happening since I
thought the code was given to me. What specific INSTALL file is it
referring? Any ideas?
> At some point far along in the process (we can be
> quite happy when it gets that far!) there's going
> to be a complaint that lsb-1.3.0-1.s390.rpm does not exist.
> We haven't "released" that package, but you can
> manually rename a snapshot obtained from
> ftp.freestandards.org:pub/lsb/snapshots/lsb
>
> (it's really quite a trivial package so we could
> go ahead and release it whenever it's needed)
I know I'll be very happy when it gets that far :-) I'll keep this in mind.
Regards,
Eliuth
"Wichmann, Mats
D" To: Eliuth Pomar/Poughkeepsie/IBM@IBMUS, <[email protected]>
<mats.d.wichmann@ cc: Marvin Heffler/Austin/IBM@IBMUS, George Kraft/Austin/IBM@IBMUS, Stephen
intel.com> Henkels/Poughkeepsie/IBM@IBMUS
Subject: RE: s390 lsbsi diffs
04/24/2003 10:54
PM
> By the way I also found a discrepancy on the changes I sent before:
>
> In entities/package
>
> <!ENTITY glibc-ia64-patch "glibc-2.2.5.s390.patch">
>
> If Anything that should be:
>
> <!ENTITY glibc-s390-patch "glibc-2.2.5.s390.patch">
Okay, I've just changed that.
IS there a glibc s390 patch that needs to be applied?
If so, please forward so we can check it in.
At some point far along in the process (we can be
quite happy when it gets that far!) there's going
to be a complaint that lsb-1.3.0-1.s390.rpm does not exist.
We haven't "released" that package, but you can
manually rename a snapshot obtained from
ftp.freestandards.org:pub/lsb/snapshots/lsb
(it's really quite a trivial package so we could
go ahead and release it whenever it's needed)
-- mats
glibc-2.2.5-s390-3-may2002.diff
(application/octet-stream, 2.5 KB)
diff -urN glibc-2.2.5/sysdeps/s390/bits/wordsize.h glibc-2.2.5-s390/sysdeps/s390/bits/wordsize.h
--- glibc-2.2.5/sysdeps/s390/bits/wordsize.h Wed Sep 11 11:32:14 2002
+++ glibc-2.2.5-s390/sysdeps/s390/bits/wordsize.h Thu Jan 1 01:00:00 1970
@@ -1,7 +0,0 @@
-/* Determine the wordsize from the preprocessor defines. */
-
-#if defined __s390x__
-# define __WORDSIZE 64
-#else
-# define __WORDSIZE 32
-#endif
diff -urN glibc-2.2.5/sysdeps/s390/s390-32/bits/wordsize.h glibc-2.2.5-s390/sysdeps/s390/s390-32/bits/wordsize.h
--- glibc-2.2.5/sysdeps/s390/s390-32/bits/wordsize.h Thu Jan 1 01:00:00 1970
+++ glibc-2.2.5-s390/sysdeps/s390/s390-32/bits/wordsize.h Wed Sep 11 11:32:14 2002
@@ -0,0 +1,7 @@
+/* Determine the wordsize from the preprocessor defines. */
+
+#if defined __s390x__
+# define __WORDSIZE 64
+#else
+# define __WORDSIZE 32
+#endif
diff -urN glibc-2.2.5/sysdeps/s390/s390-64/bits/wordsize.h glibc-2.2.5-s390/sysdeps/s390/s390-64/bits/wordsize.h
--- glibc-2.2.5/sysdeps/s390/s390-64/bits/wordsize.h Thu Jan 1 01:00:00 1970
+++ glibc-2.2.5-s390/sysdeps/s390/s390-64/bits/wordsize.h Wed Sep 11 11:34:00 2002
@@ -0,0 +1,7 @@
+/* Determine the wordsize from the preprocessor defines. */
+
+#if defined __s390x__
+# define __WORDSIZE 64
+#else
+# define __WORDSIZE 32
+#endif
diff -urN glibc-2.2.5/sysdeps/unix/sysv/linux/pread.c glibc-2.2.5-s390/sysdeps/unix/sysv/linux/pread.c
--- glibc-2.2.5/sysdeps/unix/sysv/linux/pread.c Fri Jul 6 06:56:12 2001
+++ glibc-2.2.5-s390/sysdeps/unix/sysv/linux/pread.c Wed Sep 11 11:32:50 2002
@@ -50,7 +50,7 @@
/* First try the syscall. */
result = INLINE_SYSCALL (pread, 5, fd, CHECK_N (buf, count), count,
- __LONG_LONG_PAIR (0, offset));
+ __LONG_LONG_PAIR (offset >> 31, offset));
# if __ASSUME_PREAD_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */
diff -urN glibc-2.2.5/sysdeps/unix/sysv/linux/pwrite.c glibc-2.2.5-s390/sysdeps/unix/sysv/linux/pwrite.c
--- glibc-2.2.5/sysdeps/unix/sysv/linux/pwrite.c Fri Jul 6 06:56:12 2001
+++ glibc-2.2.5-s390/sysdeps/unix/sysv/linux/pwrite.c Wed Sep 11 11:32:50 2002
@@ -50,7 +50,7 @@
/* First try the syscall. */
result = INLINE_SYSCALL (pwrite, 5, fd, CHECK_N (buf, count), count,
- __LONG_LONG_PAIR (0, offset));
+ __LONG_LONG_PAIR (offset >> 31, offset));
# if __ASSUME_PWRITE_SYSCALL == 0
if (result == -1 && errno == ENOSYS)
/* No system call available. Use the emulation. */