[glibc] 02/02: debian/control.in/libc, debian/control.in/main, debian/rules.d/control.mk: Add support for IA64. Closes: #883012.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 2ab9aac37ad9b390eff7b1406492005bda0fb6a8
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Thu Nov 30 22:07:48 2017 +0100
debian/control.in/libc, debian/control.in/main, debian/rules.d/control.mk: Add support for IA64. Closes: #883012.
---
debian/changelog | 4 ++++
debian/control | 50 +++++++++++++++++++++++------------------------
debian/control.in/libc | 2 +-
debian/control.in/main | 4 ++--
debian/rules.d/control.mk | 2 +-
debian/sysdeps/ia64.mk | 2 ++
6 files changed, 35 insertions(+), 29 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9ff4608..c46e191 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,10 @@ glibc (2.25-3) UNRELEASED; urgency=medium
* libc0.3.symbols.hurd-i386: Update against newer hurd definitions.
* control: Bump dependency accordingly.
+ [ Jason Duerstock ]
+ * debian/control.in/libc, debian/control.in/main, debian/rules.d/control.mk:
+ Add support for IA64. Closes: #883012.
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 22 Nov 2017 00:21:54 +0100
glibc (2.25-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index bc2db36..94fc0d9 100644
--- a/debian/control
+++ b/debian/control
@@ -143,8 +143,8 @@ Architecture: any
Section: oldlibs
Multi-Arch: foreign
Depends: ${misc:Depends},
- libc6 (>= 2.3.6-2) [!any-i386 !alpha !armhf !hurd-any !kfreebsd-any],
- libc6.1 (>= 2.3.6-2) [alpha],
+ libc6 (>= 2.3.6-2) [!any-i386 !alpha !armhf !hurd-any !ia64 !kfreebsd-any],
+ libc6.1 (>= 2.3.6-2) [alpha ia64],
libc0.3 (>= 2.3.6-2) [!linux-any !kfreebsd-any !hurd-i386],
libc0.1 (>= 2.3.6-2) [!linux-any !hurd-any !kfreebsd-i386],
libc6 (>= 2.13-5) [armhf i386],
@@ -158,7 +158,7 @@ Description: Transitional package to ensure multiarch compatibility
be removed once nothing on the system depends on it.
Package: libc6
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: libs
Priority: required
Multi-Arch: same
@@ -189,14 +189,14 @@ Description: GNU C Library: Shared libraries
and the standard math library, as well as many others.
Package: libc6-dev
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Suggests: glibc-doc, manpages-dev
-Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.26), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Conflicts: libc6.1-dev, libc0.1-dev, libc0.3-dev,
Description: GNU C Library: Development Libraries and Header Files
@@ -204,7 +204,7 @@ Description: GNU C Library: Development Libraries and Header Files
and link programs which use the standard C library.
Package: libc6-dbg
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: debug
Priority: optional
Multi-Arch: same
@@ -216,7 +216,7 @@ Description: GNU C Library: detached debugging symbols
library.
Package: libc6-pic
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -232,7 +232,7 @@ Description: GNU C Library: PIC archive library
Package: libc6-udeb
Package-Type: udeb
-Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
+Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
Section: debian-installer
Priority: optional
Provides: libc6, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
@@ -246,7 +246,7 @@ Description: GNU C Library: Shared libraries - udeb
installer. Do not install it on a normal system.
Package: libc6.1
-Architecture: alpha
+Architecture: alpha ia64
Section: libs
Priority: required
Multi-Arch: same
@@ -277,14 +277,14 @@ Description: GNU C Library: Shared libraries
and the standard math library, as well as many others.
Package: libc6.1-dev
-Architecture: alpha
+Architecture: alpha ia64
Section: libdevel
Priority: optional
Multi-Arch: same
Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Suggests: glibc-doc, manpages-dev
-Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.26), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Conflicts: libc6-dev, libc0.1-dev, libc0.3-dev,
Description: GNU C Library: Development Libraries and Header Files
@@ -292,7 +292,7 @@ Description: GNU C Library: Development Libraries and Header Files
and link programs which use the standard C library.
Package: libc6.1-dbg
-Architecture: alpha
+Architecture: alpha ia64
Section: debug
Priority: optional
Multi-Arch: same
@@ -304,7 +304,7 @@ Description: GNU C Library: detached debugging symbols
library.
Package: libc6.1-pic
-Architecture: alpha
+Architecture: alpha ia64
Section: libdevel
Priority: optional
Multi-Arch: same
@@ -320,7 +320,7 @@ Description: GNU C Library: PIC archive library
Package: libc6.1-udeb
Package-Type: udeb
-Architecture: alpha
+Architecture: alpha ia64
Section: debian-installer
Priority: optional
Provides: libc6.1, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
@@ -372,7 +372,7 @@ Multi-Arch: same
Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Suggests: glibc-doc, manpages-dev
-Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.26), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Conflicts: libc6-dev, libc6.1-dev, libc0.1-dev,
Description: GNU C Library: Development Libraries and Header Files
@@ -460,7 +460,7 @@ Multi-Arch: same
Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Suggests: glibc-doc, manpages-dev
-Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.26), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Conflicts: libc6-dev, libc6.1-dev, libc0.3-dev,
Description: GNU C Library: Development Libraries and Header Files
@@ -679,7 +679,7 @@ Description: GNU C Library: 64bit Development Libraries for PowerPC64
library, meant for PowerPC64 systems.
Package: libc6-mips32
-Architecture: mipsn32 mipsn32el mips64 mips64el
+Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -690,13 +690,13 @@ Description: GNU C Library: o32 Shared libraries for MIPS
of the library, meant for MIPS systems.
Package: libc6-dev-mips32
-Architecture: mipsn32 mipsn32el mips64 mips64el
+Architecture: mipsn32 mipsn32el mips64 mips64el mipsn32r6 mipsn32r6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: lib32c-dev
Depends: libc6-dev (= ${binary:Version}), libc6-mips32 (= ${binary:Version}),
- libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el],
- libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el],
+ libc6-dev-mipsn32 (= ${binary:Version}) [mips64 mips64el mips64r6 mips64r6el],
+ libc6-dev-mips64 (= ${binary:Version}) [mipsn32 mipsn32el mipsn32r6 mipsn32r6el],
${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
@@ -706,7 +706,7 @@ Description: GNU C Library: o32 Development Libraries for MIPS
library, meant for MIPS systems.
Package: libc6-mipsn32
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -717,11 +717,11 @@ Description: GNU C Library: n32 Shared libraries for MIPS64
of the library, meant for MIPS64 systems.
Package: libc6-dev-mipsn32
-Architecture: mips mipsel mips64 mips64el
+Architecture: mips mipsel mips64 mips64el mipsr6 mipsr6el mips64r6 mips64r6el
Section: libdevel
Priority: optional
Provides: libn32c-dev
-Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel], libc6-dev (= ${binary:Version}), ${misc:Depends}
+Depends: libc6-mipsn32 (= ${binary:Version}), libc6-dev-mips64 (= ${binary:Version}) [mips mipsel mipsr6 mipsr6el], libc6-dev (= ${binary:Version}), ${misc:Depends}
Recommends: gcc-multilib
Build-Profiles: <!nobiarch>
Description: GNU C Library: n32 Development Libraries for MIPS64
@@ -730,7 +730,7 @@ Description: GNU C Library: n32 Development Libraries for MIPS64
library, meant for MIPS64 systems.
Package: libc6-mips64
-Architecture: mips mipsel mipsn32 mipsn32el
+Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libs
Priority: optional
Depends: libc6 (= ${binary:Version}), ${misc:Depends}
@@ -741,7 +741,7 @@ Description: GNU C Library: 64bit Shared libraries for MIPS64
of the library, meant for MIPS64 systems.
Package: libc6-dev-mips64
-Architecture: mips mipsel mipsn32 mipsn32el
+Architecture: mips mipsel mipsn32 mipsn32el mipsr6 mipsr6el mipsn32r6 mipsn32r6el
Section: libdevel
Priority: optional
Provides: lib64c-dev
diff --git a/debian/control.in/libc b/debian/control.in/libc
index 9d4138c..a7dee6c 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -37,7 +37,7 @@ Multi-Arch: same
Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), ${misc:Depends}, ${libc-dev:Depends}, kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386] | hurd-headers-dev [hurd-i386]
Replaces: hurd-dev (<< 20120408-3) [hurd-i386], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Suggests: glibc-doc, manpages-dev
-Provides: libc-dev, libc6-dev [alpha hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Breaks: binutils (<< 2.26), binutils-gold (<< 2.20.1-11), cmake (<< 2.8.4+dfsg.1-5), gcc-4.4 (<< 4.4.6-4), gcc-4.5 (<< 4.5.3-2), gcc-4.6 (<< 4.6.0-12), make (<< 3.81-8.1), pkg-config (<< 0.26-1), libjna-java (<< 3.2.7-4), liblouis-dev (<< 2.3.0-2), liblouisxml-dev (<< 2.4.0-2), libhwloc-dev (<< 1.2-3), check (<< 0.9.10-6.1+b1) [s390x], kfreebsd-kernel-headers (<< 10.3~4) [kfreebsd-amd64 kfreebsd-i386]
Conflicts: @libc-dev-conflict@
Description: GNU C Library: Development Libraries and Header Files
diff --git a/debian/control.in/main b/debian/control.in/main
index c42fc7c..a25f33e 100644
--- a/debian/control.in/main
+++ b/debian/control.in/main
@@ -143,8 +143,8 @@ Architecture: any
Section: oldlibs
Multi-Arch: foreign
Depends: ${misc:Depends},
- libc6 (>= 2.3.6-2) [!any-i386 !alpha !armhf !hurd-any !kfreebsd-any],
- libc6.1 (>= 2.3.6-2) [alpha],
+ libc6 (>= 2.3.6-2) [!any-i386 !alpha !armhf !hurd-any !ia64 !kfreebsd-any],
+ libc6.1 (>= 2.3.6-2) [alpha ia64],
libc0.3 (>= 2.3.6-2) [!linux-any !kfreebsd-any !hurd-i386],
libc0.1 (>= 2.3.6-2) [!linux-any !hurd-any !kfreebsd-i386],
libc6 (>= 2.13-5) [armhf i386],
diff --git a/debian/rules.d/control.mk b/debian/rules.d/control.mk
index 6b61448..e3f61ac 100644
--- a/debian/rules.d/control.mk
+++ b/debian/rules.d/control.mk
@@ -3,7 +3,7 @@ libc0_1_archs := kfreebsd-amd64 kfreebsd-i386
libc0_3_archs := hurd-i386
libc6_archs := amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el \
mipsn32r6 mipsn32r6el mips64r6 mips64r6el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh3 sh4 x32
-libc6_1_archs := alpha
+libc6_1_archs := alpha ia64
control_deps := $(wildcard debian/control.in/*) $(addprefix debian/control.in/, $(libc_packages))
triggers := binutils, linux-libc-dev [linux-any], $(BASE_CC)$(DEB_GCC_VERSION)
diff --git a/debian/sysdeps/ia64.mk b/debian/sysdeps/ia64.mk
new file mode 100644
index 0000000..941270a
--- /dev/null
+++ b/debian/sysdeps/ia64.mk
@@ -0,0 +1,2 @@
+# configuration options for all flavours
+libc = libc6.1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: