r5802 - in glibc-package/branches/eglibc-2.18/debian: . control.in rules.d sysdeps testsuite-checking
Author: aurel32
Date: 2013-11-29 08:24:28 +0000 (Fri, 29 Nov 2013)
New Revision: 5802
Removed:
glibc-package/branches/eglibc-2.18/debian/control.in/s390x
glibc-package/branches/eglibc-2.18/debian/libc6-s390x.symbols.s390
glibc-package/branches/eglibc-2.18/debian/libc6.symbols.s390
glibc-package/branches/eglibc-2.18/debian/sysdeps/s390.mk
glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390-linux-gnu-libc
glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390x-linux-gnu-s390x
Modified:
glibc-package/branches/eglibc-2.18/debian/changelog
glibc-package/branches/eglibc-2.18/debian/control
glibc-package/branches/eglibc-2.18/debian/control.in/main
glibc-package/branches/eglibc-2.18/debian/eglibc-source.filelist
glibc-package/branches/eglibc-2.18/debian/rules
glibc-package/branches/eglibc-2.18/debian/rules.d/control.mk
Log:
Drop s390 support.
Modified: glibc-package/branches/eglibc-2.18/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/changelog 2013-11-29 08:24:28 UTC (rev 5802)
@@ -123,6 +123,9 @@
and kfreebsd/submitted-libc_once.diff.
* drop kfreebsd/local-readdir_r.diff, obsoleted by fix for CVE-2013-4237.
+ [ Aurelien Jarno ]
+ * Drop s390 support.
+
-- Adam Conrad <adconrad@ubuntu.com> Sat, 09 Nov 2013 12:48:20 +0100
eglibc (2.17-96) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.18/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/control 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/control 2013-11-29 08:24:28 UTC (rev 5802)
@@ -11,7 +11,7 @@
g++-4.6 [ia64],
g++-4.7 (>= 4.7.3-4) [kfreebsd-amd64],
g++-4.8 [arm64 ppc64el],
- g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32]
+ g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390x sparc sparc64 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
@@ -138,7 +138,7 @@
be removed once nothing on the system depends on it.
Package: libc6
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libs
Priority: required
Multi-Arch: same
@@ -163,7 +163,7 @@
and the standard math library, as well as many others.
Package: libc6-dev
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -179,7 +179,7 @@
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: debug
Priority: extra
Multi-Arch: same
@@ -190,7 +190,7 @@
library.
Package: libc6-prof
-Architecture: amd64 arm armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libdevel
Priority: extra
Multi-Arch: same
@@ -200,7 +200,7 @@
with gprof.
Package: libc6-pic
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -215,7 +215,7 @@
Package: libc6-udeb
XC-Package-Type: udeb
-Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+Architecture: amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: debian-installer
Priority: extra
Provides: libc6, libc-udeb, ${locale-compat:Depends}
@@ -597,30 +597,6 @@
which use the standard C library. This is the 32bit version of the
library.
-Package: libc6-s390x
-Architecture: s390
-Section: libs
-Priority: optional
-Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Description: Embedded GNU C Library: 64bit Shared libraries for IBM zSeries
- This package includes shared versions of the standard C library and the
- standard math library, as well as many others. This is the 64bit version
- of the library, meant for zSeries systems.
-
-Package: libc6-dev-s390x
-Architecture: s390
-Section: libdevel
-Priority: optional
-Provides: lib64c-dev
-Conflicts: libc6-dev (<< 2.13-14)
-Replaces: libc6-dev (<< 2.13-11)
-Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
-Recommends: gcc-multilib
-Description: Embedded GNU C Library: 64bit Development Libraries for IBM zSeries
- Contains the symlinks and object files needed to compile and link programs
- which use the standard C library. This is the 64bit version of the
- library, meant for zSeries systems.
-
Package: libc6-amd64
Architecture: i386 x32
Section: libs
Modified: glibc-package/branches/eglibc-2.18/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/control.in/main 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/control.in/main 2013-11-29 08:24:28 UTC (rev 5802)
@@ -11,7 +11,7 @@
g++-4.6 [ia64],
g++-4.7 (>= 4.7.3-4) [kfreebsd-amd64],
g++-4.8 [arm64 ppc64el],
- g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390 s390x sparc sparc64 x32]
+ g++-4.7 (>= 4.7.2-11), g++-4.7-multilib [amd64 i386 kfreebsd-amd64 mips mipsel powerpc ppc64 s390x sparc sparc64 x32]
Build-Depends-Indep: perl, po-debconf (>= 1.0)
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>
Deleted: glibc-package/branches/eglibc-2.18/debian/control.in/s390x
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/control.in/s390x 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/control.in/s390x 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,24 +0,0 @@
-Package: libc6-s390x
-Architecture: s390
-Section: libs
-Priority: optional
-Depends: libc6 (= ${binary:Version}), ${misc:Depends}
-Description: Embedded GNU C Library: 64bit Shared libraries for IBM zSeries
- This package includes shared versions of the standard C library and the
- standard math library, as well as many others. This is the 64bit version
- of the library, meant for zSeries systems.
-
-Package: libc6-dev-s390x
-Architecture: s390
-Section: libdevel
-Priority: optional
-Provides: lib64c-dev
-Conflicts: libc6-dev (<< 2.13-14)
-Replaces: libc6-dev (<< 2.13-11)
-Depends: libc6-s390x (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
-Recommends: gcc-multilib
-Description: Embedded GNU C Library: 64bit Development Libraries for IBM zSeries
- Contains the symlinks and object files needed to compile and link programs
- which use the standard C library. This is the 64bit version of the
- library, meant for zSeries systems.
-
Modified: glibc-package/branches/eglibc-2.18/debian/eglibc-source.filelist
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/eglibc-source.filelist 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/eglibc-source.filelist 2013-11-29 08:24:28 UTC (rev 5802)
@@ -10,7 +10,6 @@
debian/libc6-mipsn32.symbols.mips
debian/libc6-mipsn32.symbols.mipsel
debian/libc6-ppc64.symbols.powerpc
-debian/libc6-s390x.symbols.s390
debian/libc6-sparc64.symbols.sparc
debian/libc6.1.symbols.alpha
debian/libc6.1.symbols.ia64
@@ -25,7 +24,6 @@
debian/libc6.symbols.mips
debian/libc6.symbols.mipsel
debian/libc6.symbols.powerpc
-debian/libc6.symbols.s390
debian/libc6.symbols.sparc
debian/libc6.symbols.sparc64
debian/README
Deleted: glibc-package/branches/eglibc-2.18/debian/libc6-s390x.symbols.s390
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/libc6-s390x.symbols.s390 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/libc6-s390x.symbols.s390 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,5 +0,0 @@
-#include "libc6.symbols.common"
-ld64.so.1 #PACKAGE# #MINVER#
-#include "symbols.wildcards"
-libc.so.6 #PACKAGE# #MINVER#
-#include "symbols.wildcards"
Deleted: glibc-package/branches/eglibc-2.18/debian/libc6.symbols.s390
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/libc6.symbols.s390 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/libc6.symbols.s390 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,12 +0,0 @@
-#include "libc6.symbols.common"
-ld.so.1 #PACKAGE# #MINVER#
-#include "symbols.wildcards"
-### TLS support enabled in Debian upload 2.4
- __tls_get_offset@GLIBC_2.3 2.4
-libc.so.6 #PACKAGE# #MINVER#
-#include "symbols.wildcards"
-###
-### Override headers already defined in libc6.symbols.common
-###
-libpthread.so.0 #PACKAGE# (>= 2.4), #PACKAGE# #MINVER#
-#include "symbols.wildcards"
Modified: glibc-package/branches/eglibc-2.18/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/rules 2013-11-29 08:24:28 UTC (rev 5802)
@@ -185,7 +185,6 @@
NODEBUG_libc6-powerpc = 1
NODEBUG_libc6-ppc64 = 1
NODEBUG_libc6-s390 = 1
-NODEBUG_libc6-s390x = 1
NODEBUG_libc6-sparc64 = 1
NODEBUG_libc6-mips64 = 1
NODEBUG_nscd = 1
Modified: glibc-package/branches/eglibc-2.18/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/rules.d/control.mk 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/rules.d/control.mk 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,7 +1,7 @@
libc_packages := libc6 libc6.1 libc0.1 libc0.3
libc0_1_archs := kfreebsd-amd64 kfreebsd-i386
libc0_3_archs := hurd-i386
-libc6_archs := amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390 s390x sh4 x32
+libc6_archs := amd64 arm arm64 armel armhf hppa i386 m68k mips mipsel powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
libc6_1_archs := alpha ia64
control_deps := $(wildcard debian/control.in/*) $(addprefix debian/control.in/, $(libc_packages))
@@ -30,7 +30,6 @@
cat debian/control.in/sparc >> $@T
cat debian/control.in/sparc64 >> $@T
cat debian/control.in/s390 >> $@T
- cat debian/control.in/s390x >> $@T
cat debian/control.in/amd64 >> $@T
cat debian/control.in/powerpc >> $@T
cat debian/control.in/ppc64 >> $@T
Deleted: glibc-package/branches/eglibc-2.18/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/sysdeps/s390.mk 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/sysdeps/s390.mk 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,35 +0,0 @@
-# build 64-bit (s390x) alternative library
-EGLIBC_PASSES += s390x
-DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
-s390x_add-ons = nptl $(add-ons)
-s390x_configure_target = s390x-linux-gnu
-s390x_CC = $(CC) -m64
-s390x_CXX = $(CXX) -m64
-libc6-s390x_shlib_dep = libc6-s390x (>= $(shlib_dep_ver))
-s390x_extra_config_options := $(extra_config_options) --disable-profile
-s390x_rtlddir = /lib64
-s390x_slibdir = /lib64
-s390x_libdir = /usr/lib64
-
-define libc6-dev-s390x_extra_pkg_install
-
-mkdir -p debian/libc6-dev-s390x/usr/include
-ln -s s390-linux-gnu/bits debian/libc6-dev-s390x/usr/include/
-ln -s s390-linux-gnu/gnu debian/libc6-dev-s390x/usr/include/
-ln -s s390-linux-gnu/fpu_control.h debian/libc6-dev-s390x/usr/include/
-
-mkdir -p debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu
-cp -a debian/tmp-s390x/usr/include/gnu/stubs-64.h \
- debian/libc6-dev-s390x/usr/include/s390-linux-gnu/gnu
-
-mkdir -p debian/libc6-dev-s390x/usr/include/sys
-for i in `ls debian/tmp-libc/usr/include/s390-linux-gnu/sys` ; do \
- ln -s ../s390-linux-gnu/sys/$$i debian/libc6-dev-s390x/usr/include/sys/$$i ; \
-done
-
-endef
-
-define libc6-s390x_extra_pkg_install
-mkdir -p debian/$(curpass)/lib
-ln -s /lib64/ld64.so.1 debian/$(curpass)/lib
-endef
Deleted: glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390-linux-gnu-libc
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390-linux-gnu-libc 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390-linux-gnu-libc 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,15 +0,0 @@
-#
-# Allowed failures for s390-linux-gnu-libc and the returned make
-# failure number, indicating the signal the process died with.
-# Format: <Failed test>, Error <Make error code> [(ignored)]
-#
-annexc.out, Error 1 (ignored)
-bug22.out, Error 1
-check-localplt.out, Error 1
-run-conformtest.out, Error 1 (ignored)
-tst-cpuclock2.out, Error 1
-tst-mqueue5.out, Error 1
-tst-robust8.out, Error 1
-tst-timer.out, Error 139
-tst-waitid.out, Error 1
-tst-cputimer1.out, Error 1
Deleted: glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390x-linux-gnu-s390x
===================================================================
--- glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390x-linux-gnu-s390x 2013-11-29 07:15:35 UTC (rev 5801)
+++ glibc-package/branches/eglibc-2.18/debian/testsuite-checking/expected-results-s390x-linux-gnu-s390x 2013-11-29 08:24:28 UTC (rev 5802)
@@ -1,16 +0,0 @@
-#
-# Allowed failures for s390x-linux-gnu-s390x and the returned make
-# failure number, indicating the signal the process died with.
-# Format: <Failed test>, Error <Make error code> [(ignored)]
-#
-annexc.out, Error 1 (ignored)
-check-localplt.out, Error 1
-run-conformtest.out, Error 1 (ignored)
-tst-backtrace6.out, Error 1
-tst-cpuclock2.out, Error 1
-tst-mqueue5.out, Error 1
-tst-robust8.out, Error 1
-tst-timer.out, Error 139
-tst-waitid.out, Error 1
-tst-writev.out, Error 1
-tst-cputimer1.out, Error 1
Reply to: