r2418 - in glibc-package/trunk/debian: . control.in script.in sysdeps
Author: aurel32
Date: 2007-07-18 19:05:32 +0000 (Wed, 18 Jul 2007)
New Revision: 2418
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/opt
glibc-package/trunk/debian/script.in/kernelcheck.sh
glibc-package/trunk/debian/sysdeps/depflags.pl
glibc-package/trunk/debian/sysdeps/sparc.mk
Log:
* Drop SPARC V8 support:
- control.in/opt: drop libc6-sparcv9.
- sysdeps/sparc.mk: drop libc6-sparcv9, build libc6 for SPARC V9.
- sysdeps/depflags.pl: make libc6 provide libc6-sparcv9 on sparc.
- script.in/kernelcheck.sh: add check for SPARC V8 or earlier CPU.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-07-16 21:26:27 UTC (rev 2417)
+++ glibc-package/trunk/debian/changelog 2007-07-18 19:05:32 UTC (rev 2418)
@@ -7,6 +7,11 @@
2.6.1. Closes: bug#432721.
* hppa/submitted-threaddb.diff: new patch from Randolph Chung to fix
debugging interface for NPTL on hppa.
+ * Drop SPARC V8 support:
+ - control.in/opt: drop libc6-sparcv9.
+ - sysdeps/sparc.mk: drop libc6-sparcv9, build libc6 for SPARC V9.
+ - sysdeps/depflags.pl: make libc6 provide libc6-sparcv9 on sparc.
+ - script.in/kernelcheck.sh: add check for SPARC V8 or earlier CPU.
[ Pierre Habouzit ]
* rules.d/debhelper.mk: add some magic to copy debian/bug/$pkg/ files into
@@ -16,7 +21,7 @@
* add locales/presubj about locales depends that are correct, and tell bug
reporters how to look for their package being built or not.
- -- Pierre Habouzit <madcoder@debian.org> Mon, 16 Jul 2007 23:05:10 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Wed, 18 Jul 2007 21:05:06 +0200
glibc (2.6-2) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2007-07-16 21:26:27 UTC (rev 2417)
+++ glibc-package/trunk/debian/control 2007-07-18 19:05:32 UTC (rev 2418)
@@ -553,20 +553,6 @@
which use the standard C library. This is the 32bit version of the
library, meant for AMD64 systems.
-Package: libc6-sparcv9
-Architecture: sparc
-Section: libs
-Priority: extra
-Pre-Depends: libc6 (= ${binary:Version})
-Description: GNU C Library: Shared libraries [v9 optimized]
- Contains the standard libraries that are used by nearly all programs on
- the system. This package includes shared versions of the standard C
- library and the standard math library, as well as many others.
- .
- This set of libraries is optimized for the UltraSPARC v9 ABI. It only
- needs to be installed on UltraSPARC machines. If you install this on a
- non-UltraSPARC, it won't even be used.
-
Package: libc6-sparcv9b
Architecture: sparc
Section: libs
Modified: glibc-package/trunk/debian/control.in/opt
===================================================================
--- glibc-package/trunk/debian/control.in/opt 2007-07-16 21:26:27 UTC (rev 2417)
+++ glibc-package/trunk/debian/control.in/opt 2007-07-18 19:05:32 UTC (rev 2418)
@@ -1,17 +1,3 @@
-Package: libc6-sparcv9
-Architecture: sparc
-Section: libs
-Priority: extra
-Pre-Depends: libc6 (= ${binary:Version})
-Description: GNU C Library: Shared libraries [v9 optimized]
- Contains the standard libraries that are used by nearly all programs on
- the system. This package includes shared versions of the standard C
- library and the standard math library, as well as many others.
- .
- This set of libraries is optimized for the UltraSPARC v9 ABI. It only
- needs to be installed on UltraSPARC machines. If you install this on a
- non-UltraSPARC, it won't even be used.
-
Package: libc6-sparcv9b
Architecture: sparc
Section: libs
Modified: glibc-package/trunk/debian/script.in/kernelcheck.sh
===================================================================
--- glibc-package/trunk/debian/script.in/kernelcheck.sh 2007-07-16 21:26:27 UTC (rev 2417)
+++ glibc-package/trunk/debian/script.in/kernelcheck.sh 2007-07-18 19:05:32 UTC (rev 2418)
@@ -125,6 +125,29 @@
exit_check
fi
fi
+
+ # From glibc 2.6-3 SPARC V8 support is dropped.
+ if [ "$realarch" = sparc ]
+ then
+ # The process could be run using linux32, check for /proc.
+ if [ -f /proc/cpuinfo ]
+ then
+ case "$(sed '/^type/!d;s/^type.*: //g' /proc/cpuinfo)" in
+ sun4u)
+ # UltraSPARC CPU
+ ;;
+ sun4v)
+ # Niagara CPU
+ ;;
+ *)
+ echo "WARNING: This machine has a SPARC V8 or earlier class processor."
+ echo "Debian lenny and later does not support such old hardware"
+ echo "any longer."
+ exit_check
+ ;;
+ esac
+ fi
+ fi
elif [ $system = "GNU/kFreeBSD" ] ; then
kernel_ver=`uname -r`
if kfreebsd_compare_versions "$kernel_ver" lt 6.0
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2007-07-16 21:26:27 UTC (rev 2417)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2007-07-18 19:05:32 UTC (rev 2418)
@@ -86,6 +86,10 @@
push @{$libc_c{'Depends'}}, 'libgcc1';
}
+# Provides libc6-sparcv9 on sparc
+if ($DEB_HOST_ARCH =~ m/^sparc$/) {
+ push @{$libc_c{'Provides'}}, 'libc6-sparcv9';
+
if ($type eq "libc") {
%pkg = %libc_c;
} elsif ($type eq "libc_dev") {
Modified: glibc-package/trunk/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/sparc.mk 2007-07-16 21:26:27 UTC (rev 2417)
+++ glibc-package/trunk/debian/sysdeps/sparc.mk 2007-07-18 19:05:32 UTC (rev 2418)
@@ -1,3 +1,6 @@
+libc_configure_target=sparcv9-linux
+libc_configure_build=sparcv9-linux
+
# build 64-bit (sparc64) alternative library
GLIBC_PASSES += sparc64
DEB_ARCH_REGULAR_PACKAGES += libc6-sparc64 libc6-dev-sparc64
@@ -19,17 +22,6 @@
ln -sf . debian/libc6-dev-sparc64/usr/include/sparc64-linux-gnu
endef
-# build a sparcv9 optimized library
-GLIBC_PASSES += sparcv9
-DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9
-sparcv9_add-ons = nptl $(add-ons)
-sparcv9_configure_target=sparcv9-linux
-sparcv9_configure_build=sparcv9-linux
-sparcv9_extra_cflags = -g -O3
-sparcv9_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9_rtlddir = /lib
-sparcv9_slibdir = /lib/v9
-
# build a sparcv9b optimized library
GLIBC_PASSES += sparcv9b
DEB_ARCH_REGULAR_PACKAGES += libc6-sparcv9b
Reply to: