r4805 - in glibc-package/trunk/debian: . control.in rules.d sysdeps
Author: aurel32
Date: 2011-07-22 11:09:52 +0000 (Fri, 22 Jul 2011)
New Revision: 4805
Added:
glibc-package/trunk/debian/control.in/s390
glibc-package/trunk/debian/sysdeps/s390x.mk
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/rules.d/control.mk
Log:
* Add support for s390x.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-07-21 20:25:46 UTC (rev 4804)
+++ glibc-package/trunk/debian/changelog 2011-07-22 11:09:52 UTC (rev 4805)
@@ -16,6 +16,7 @@
* Reenable patches/any/cvs-resolv-different-nameserver.diff. Add
patches/any/submitted-resolv-assert.diff to fix assertion triggered by the
previous patch. Closes: #535504, #602291.
+ * Add support for s390x.
-- Aurelien Jarno <aurel32@debian.org> Sun, 10 Jul 2011 22:01:11 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-07-21 20:25:46 UTC (rev 4804)
+++ glibc-package/trunk/debian/control 2011-07-22 11:09:52 UTC (rev 4805)
@@ -131,7 +131,7 @@
be removed once nothing on the system depends on it.
Package: libc6
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
Multi-Arch: same
@@ -154,7 +154,7 @@
and the standard math library, as well as many others.
Package: libc6-dev
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
@@ -167,7 +167,7 @@
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
Section: debug
Priority: extra
Multi-Arch: same
@@ -178,7 +178,7 @@
library.
Package: libc6-prof
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: extra
Multi-Arch: same
@@ -188,7 +188,7 @@
with gprof.
Package: libc6-pic
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -204,7 +204,7 @@
Package: libc6-udeb
XC-Package-Type: udeb
-Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb
+Architecture: amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb
Section: debian-installer
Priority: extra
Provides: libc6, libc-udeb, ${locale-compat:Depends}
Added: glibc-package/trunk/debian/control.in/s390
===================================================================
--- glibc-package/trunk/debian/control.in/s390 (rev 0)
+++ glibc-package/trunk/debian/control.in/s390 2011-07-22 11:09:52 UTC (rev 4805)
@@ -0,0 +1,22 @@
+Package: libc6-s390
+Architecture: s390x
+Section: libs
+Priority: optional
+Depends: libc6 (= ${binary:Version}), ${misc:Depends}
+Description: Embedded GNU C Library: 32bit 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 32bit version
+ of the library.
+
+Package: libc6-dev-s390
+Architecture: s390x
+Section: libdevel
+Priority: optional
+Provides: lib32c-dev
+Depends: libc6-s390 (= ${binary:Version}), libc6-dev (= ${binary:Version}), ${misc:Depends}
+Recommends: gcc-multilib
+Description: Embedded GNU C Library: 32bit 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 32bit version of the
+ library.
+
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2011-07-21 20:25:46 UTC (rev 4804)
+++ glibc-package/trunk/debian/rules.d/control.mk 2011-07-22 11:09:52 UTC (rev 4805)
@@ -1,8 +1,8 @@
-control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64 mipsn32 mips64)
+control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390 s390x powerpc ppc64 opt amd64 mipsn32 mips64)
debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6%g' \
- -e 's%@archs@%amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
+ -e 's%@archs@%amd64 arm armeb armel armhf i386 m32r m68k mips mipsel powerpc powerpcspe ppc64 sparc sparc64 s390 s390x hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
debian/control.in/libc6.1: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6.1%g;s%@archs@%alpha ia64%g' < $< > $@
@@ -29,6 +29,7 @@
cat debian/control.in/libc0.1 >> $@T
cat debian/control.in/i386 >> $@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
Added: glibc-package/trunk/debian/sysdeps/s390x.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390x.mk (rev 0)
+++ glibc-package/trunk/debian/sysdeps/s390x.mk 2011-07-22 11:09:52 UTC (rev 4805)
@@ -0,0 +1,30 @@
+libc_rtlddir = /lib32
+
+# /lib32 and /usr/lib32 are provided by glibc instead base-files: #259302.
+define libc6_extra_pkg_install
+ln -sf /lib debian/$(curpass)/lib32
+ln -sf lib debian/$(curpass)/usr/lib32
+
+# build 32-bit (s390) alternative library
+EGLIBC_PASSES += s390
+DEB_ARCH_REGULAR_PACKAGES += libc6-s390 libc6-dev-s390
+s390_add-ons = nptl $(add-ons)
+s390_configure_target = s390-linux-gnu
+s390_CC = $(CC) -m32
+s390_CXX = $(CXX) -m32
+s390_extra_config_options := $(extra_config_options) --disable-profile
+s390_includedir = /usr/include/s390-linux-gnu
+s390_slibdir = /lib32
+s390_libdir = /usr/lib32
+
+define libc6-dev-s390_extra_pkg_install
+mkdir -p debian/libc6-dev-s390/usr/include/gnu
+cp -af debian/tmp-s390/usr/include/s390-linux-gnu/gnu/stubs-32.h \
+ debian/libc6-dev-s390/usr/include/gnu
+mkdir -p debian/libc6-dev-s390/usr/include/s390-linux-gnu
+endef
+
+define libc6-s390_extra_pkg_install
+mkdir -p debian/$(curpass)/lib
+ln -s /lib32/ld.so.1 debian/$(curpass)/lib
+endef
Reply to: