Author: gotom Date: 2005-07-14 15:23:33 +0000 (Thu, 14 Jul 2005) New Revision: 941
Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/control glibc-package/trunk/debian/control.in/main glibc-package/trunk/debian/debhelper.in/libc.postinst glibc-package/trunk/debian/debhelper.in/libc.postrm glibc-package/trunk/debian/debhelper.in/libc.preinst glibc-package/trunk/debian/rules glibc-package/trunk/debian/sysdeps/depflags.pl glibc-package/trunk/debian/sysdeps/i386.mk Log: * The New dpkg-architecture changes: - debian/rules: Replace DEB_HOST_BUILD_SYSTEM, use DEB_HOST_ARCH_OS. Reported by Arthur Marsh <[EMAIL PROTECTED]>. (Closes: #315347, #315793) - debian/control.in/main: Bump up Build-Depends: dpkg-dev (>= 1.13.5). - debian/control: Updated. - debian/debhelper.in/libc.preinst: Replace "dpkg --print-installation-architecture", use "dpkg --print-architecture". - debian/debhlper.in/libc.postrm: Likewise. - debian/debhlper.in/libc.postinst: Likewise. - debian/sysdeps/depflags.pl: Change checks from i386 to i486. It also replaces -linux, use -linux-gnu. * Default compiler moves from gcc-3.3 to gcc-4.0: - debian/rules: Use gcc-4.0 instead of gcc-3.3. (Closes: #315198) - debian/control.in/main: Define Build-Depends: gcc-4.0. - debian/control: Updated. - debian/sysdeps/i386.mk: Replace depreciated "-mcpu", use "-mtune". Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/changelog 2005-07-14 15:23:33 UTC (rev 941) @@ -4,15 +4,34 @@ * Merge glibc-2.3.4 branch to the main trunk for etch development. - * These dpatches are removed from debian/patches because the similar - patches are already applied in the latest version: - - debian/patches/rtld-vdso-assertion.dpatch - - debian/patches/glibc232-sigsetjmp.dpatch - - debian/patches/hurd-weak-aliases.dpatch - - debian/patches/sched-update.dpatch - - debian/patches/glibc232-pthread-cancellation.dpatch - - debian/patches/glibc232-clock_settime.dpatch + * These dpatches are removed from debian/patches because the similar + patches are already applied in the latest version: + - debian/patches/rtld-vdso-assertion.dpatch + - debian/patches/glibc232-sigsetjmp.dpatch + - debian/patches/hurd-weak-aliases.dpatch + - debian/patches/sched-update.dpatch + - debian/patches/glibc232-pthread-cancellation.dpatch + - debian/patches/glibc232-clock_settime.dpatch + * The New dpkg-architecture changes: + - debian/rules: Replace DEB_HOST_BUILD_SYSTEM, use DEB_HOST_ARCH_OS. + Reported by Arthur Marsh <[EMAIL PROTECTED]>. + (Closes: #315347, #315793) + - debian/control.in/main: Bump up Build-Depends: dpkg-dev (>= 1.13.5). + - debian/control: Updated. + - debian/debhelper.in/libc.preinst: Replace "dpkg + --print-installation-architecture", use "dpkg --print-architecture". + - debian/debhlper.in/libc.postrm: Likewise. + - debian/debhlper.in/libc.postinst: Likewise. + - debian/sysdeps/depflags.pl: Change checks from i386 to i486. + It also replaces -linux, use -linux-gnu. + + * Default compiler moves from gcc-3.3 to gcc-4.0: + - debian/rules: Use gcc-4.0 instead of gcc-3.3. (Closes: #315198) + - debian/control.in/main: Define Build-Depends: gcc-4.0. + - debian/control: Updated. + - debian/sysdeps/i386.mk: Replace depreciated "-mcpu", use "-mtune". + * Move /etc/locale.alias to /usr/share/locale/locale.alias. Don't install locale.alias.5. (Closes: #144670, #185991, #298784) - debian/local/usr_sbin/locale-gen: Use /usr/share/locale/locale.alias Modified: glibc-package/trunk/debian/control =================================================================== --- glibc-package/trunk/debian/control 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/control 2005-07-14 15:23:33 UTC (rev 941) @@ -1,7 +1,7 @@ Source: glibc Section: libs Priority: required -Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3 [!ia64] | gcc-3.4 [!ia64], gcc-3.3 (>= 1:3.3.5-5) [ia64] | gcc-3.4 (>= 3.4.3-2) [ia64], autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76) +Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.13.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-4.0, autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76) Build-Depends-Indep: perl, po-debconf Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> Uploaders: Ben Collins <[EMAIL PROTECTED]>, GOTO Masanori <[EMAIL PROTECTED]>, Philip Blundell <[EMAIL PROTECTED]>, Jeff Bailey <[EMAIL PROTECTED]>, Daniel Jacobowitz <[EMAIL PROTECTED]> Modified: glibc-package/trunk/debian/control.in/main =================================================================== --- glibc-package/trunk/debian/control.in/main 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/control.in/main 2005-07-14 15:23:33 UTC (rev 941) @@ -1,7 +1,7 @@ Source: @glibc@ Section: libs Priority: required -Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.4.1.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-3.3 [!ia64] | gcc-3.4 [!ia64], gcc-3.3 (>= 1:3.3.5-5) [ia64] | gcc-3.4 (>= 3.4.3-2) [ia64], autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76) +Build-Depends: gettext (>= 0.10.37-1), make (>= 3.80-1), dpkg-dev (>= 1.13.5), debianutils (>= 1.13.1), tar (>= 1.13.11), bzip2, texinfo (>= 4.0), linux-kernel-headers (>= 2.5.999-test7-bk-9) [!hurd-i386], mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386], texi2html, file, gcc-4.0, autoconf, binutils (>= 2.14.90.0.7-5), sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76) Build-Depends-Indep: perl, po-debconf Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> Uploaders: Ben Collins <[EMAIL PROTECTED]>, GOTO Masanori <[EMAIL PROTECTED]>, Philip Blundell <[EMAIL PROTECTED]>, Jeff Bailey <[EMAIL PROTECTED]>, Daniel Jacobowitz <[EMAIL PROTECTED]> Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc.postinst 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2005-07-14 15:23:33 UTC (rev 941) @@ -193,7 +193,7 @@ # it's first time to install ld.so.hwcappkgs aware packages. We record # all current hwcap package status. if [ ! -f /etc/ld.so.hwcappkgs ]; then - case $(dpkg --print-installation-architecture) in + case $(dpkg --print-architecture) in i386) hwcappkgs="libc6 libc6-i686" ;; Modified: glibc-package/trunk/debian/debhelper.in/libc.postrm =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc.postrm 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/debhelper.in/libc.postrm 2005-07-14 15:23:33 UTC (rev 941) @@ -12,7 +12,7 @@ fi if [ "$1" = upgrade ]; then - case $(dpkg --print-installation-architecture) in + case $(dpkg --print-architecture) in i386|sparc) if dpkg --compare-versions "$2" lt 2.3.4-3; then # Make sure the downgraded package does not support Modified: glibc-package/trunk/debian/debhelper.in/libc.preinst =================================================================== --- glibc-package/trunk/debian/debhelper.in/libc.preinst 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/debhelper.in/libc.preinst 2005-07-14 15:23:33 UTC (rev 941) @@ -293,7 +293,7 @@ fi if [ "$realarch" = mips ] \ - && [ "`dpkg --print-installation-architecture`" = mips ] + && [ "`dpkg --print-architecture`" = mips ] then # MIPS (but not mipsel) require a kernel update for the msq fixes. if dpkg --compare-versions "$kernel_ver" lt 2.4.22 @@ -307,7 +307,7 @@ # amd64 requires 2.6 kernel because we drop to support linuxthreads if [ "$realarch" = x86_64 ] \ - && [ "`dpkg --print-installation-architecture`" = amd64 ] + && [ "`dpkg --print-architecture`" = amd64 ] then if dpkg --compare-versions "$kernel_ver" lt 2.6.0 then Modified: glibc-package/trunk/debian/rules =================================================================== --- glibc-package/trunk/debian/rules 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/rules 2005-07-14 15:23:33 UTC (rev 941) @@ -42,7 +42,7 @@ DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) @@ -81,7 +81,7 @@ sbindir=$(prefix)/sbin libexecdir=$(prefix)/lib -BUILD_CC = gcc-3.3 +BUILD_CC = gcc-4.0 # Set CC for cross-compiling ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) @@ -125,7 +125,7 @@ # Pull in all the per-arch magic! --include debian/sysdeps/$(DEB_HOST_GNU_SYSTEM).mk +-include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk -include debian/sysdeps/$(DEB_HOST_ARCH).mk include debian/sysdeps/depflags.mk Modified: glibc-package/trunk/debian/sysdeps/depflags.pl =================================================================== --- glibc-package/trunk/debian/sysdeps/depflags.pl 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/sysdeps/depflags.pl 2005-07-14 15:23:33 UTC (rev 941) @@ -26,7 +26,7 @@ push @{$libc_c{'Conflicts'}}, 'glibc2'; push @{$libc_c{'Depends'}}, 'hurd (>= 20010718-1)'; } -if ($DEB_HOST_GNU_SYSTEM eq "linux") { +if ($DEB_HOST_GNU_SYSTEM eq "linux-gnu") { push @{$libc_c{'Suggests'}}, 'locales'; #db1 compat libraries from libc 2.0/2.1, we need to depend on them #until after sarge is released @@ -54,7 +54,7 @@ # 2.2.2+CVS requires a newer gcc. For non-i386, we just worry about the # weak-sym patch, since on i386 we need an even newer one because of the # pic-kludge that breaks libc_nonshared.a inclusion. -if ($DEB_HOST_GNU_TYPE =~ m/^i386-linux$/) { +if ($DEB_HOST_GNU_TYPE =~ m/^i486-linux-gnu$/) { push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-9)'; } else { push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-8)'; @@ -75,12 +75,12 @@ 'libtricks', "${libc}-doc"); # conflicts from libc5 days -if ($DEB_HOST_GNU_TYPE =~ m/^(i386|m68k)-linux$/) { +if ($DEB_HOST_GNU_TYPE =~ m/^(i486|m68k)-linux-gnu$/) { push @{$libc_c{'Conflicts'}}, ('libc5 (<< 5.4.33-7)', 'libpthread0 (<< 0.7-10)'); -} elsif ($DEB_HOST_GNU_TYPE eq 'sparc-linux') { +} elsif ($DEB_HOST_GNU_TYPE eq 'sparc-linux-gnu') { push @{$libc_c{'Conflicts'}}, ('libc5 (<< 5.3.12-2)', 'libpthread0 (<< 0.7-10)'); } -if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i386|m68k|sparc)-linux$/) { +if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i486|m68k|sparc)-linux-gnu$/) { push @{$libc_dev_c{'Conflicts'}}, ('libpthread0-dev', 'libdl1-dev', 'libdb1-dev', 'libgdbm1-dev'); # Add this here too, old package @@ -89,28 +89,28 @@ } # Old, Pre glibc 2.1 -if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i386|m68k|sparc|powerpc|arm)-linux$/) { +if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i486|m68k|sparc|powerpc|arm)-linux-gnu$/) { push @{$libc_dev_c{'Conflicts'}}, ("${libc}-dev (<< 2.0.110-1)", 'locales (<< 2.1.3-5)'); } # XXX: Not sure why this conflict is here, maybe broken c++? -if ($DEB_HOST_GNU_TYPE =~ m/^(i386|m68k|alpha)-linux$/) { +if ($DEB_HOST_GNU_TYPE =~ m/^(i486|m68k|alpha)-linux-gnu$/) { push @{$libc_c{'Conflicts'}}, ('apt (<< 0.3.0)', 'libglib1.2 (<< 1.2.1-2)'); } # Some old c++ libs -if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i386)-linux$/) { +if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i486)-linux-gnu$/) { push @{$libc_dev_c{'Conflicts'}}, 'libstdc++2.9-dev'; -} elsif ($DEB_HOST_GNU_TYPE eq "powerpc-linux") { +} elsif ($DEB_HOST_GNU_TYPE eq "powerpc-linux-gnu") { push @{$libc_dev_c{'Conflicts'}}, ('libstdc++2.9 (<< 2.91.58-2.1)', 'libstdc++2.8 (<< 2.90.29-1)'); -} elsif ($DEB_HOST_GNU_TYPE eq "m68k-linux") { +} elsif ($DEB_HOST_GNU_TYPE eq "m68k-linux-gnu") { push @{$libc_dev_c{'Conflicts'}}, 'libstdc++2.9-dev'; } # XXX: What is this!? -if ($DEB_HOST_GNU_TYPE eq "alpha-linux") { +if ($DEB_HOST_GNU_TYPE eq "alpha-linux-gnu") { push @{$libc_dev_c{'Conflicts'}}, ('libncurses4-dev (<< 4.2-3.1)', 'libreadlineg2-dev (<< 2.1-13.1)'); } @@ -131,7 +131,7 @@ # Conflict old gcc because they have /usr/hppa64-linux/include symlink # (Bug#239020) -if ($DEB_HOST_GNU_TYPE eq "hppa-linux") { +if ($DEB_HOST_GNU_TYPE eq "hppa-linux-gnu") { push @{$libc_dev_c{'Conflicts'}}, ('gcc-3.3-hppa64 (<= 1:3.3.3-6)', 'gcc-3.4-hppa64 (<= 3.4-0pre4)'); } Modified: glibc-package/trunk/debian/sysdeps/i386.mk =================================================================== --- glibc-package/trunk/debian/sysdeps/i386.mk 2005-07-12 14:30:21 UTC (rev 940) +++ glibc-package/trunk/debian/sysdeps/i386.mk 2005-07-14 15:23:33 UTC (rev 941) @@ -6,7 +6,7 @@ # emulate the missing instructions on the i386. nptl_configure_target=i486-linux nptl_configure_build=i486-linux -nptl_extra_cflags = -march=i486 -mcpu=i686 -g1 -O3 +nptl_extra_cflags = -march=i486 -mtune=i686 -g1 -O3 # We use -march=i686 and glibc's i686 routines use cmov, so require it. # A Debian-local glibc patch adds cmov to the search path. @@ -14,7 +14,7 @@ i686_add-ons = nptl $(add-ons) i686_configure_target=i686-linux i686_configure_build=i686-linux -i686_extra_cflags = -march=i686 -mcpu=i686 -g1 -O3 +i686_extra_cflags = -march=i686 -mtune=i686 -g1 -O3 i686_LIBDIR = /tls/i686/cmov i686_MIN_KERNEL_SUPPORTED = 2.6.0 i686_extra_config_options = $(extra_config_options) --disable-profile --with-tls --with-__thread -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]