r1271 - in glibc-package/branches/glibc-2.4/debian: . debhelper.in patches rules.d sysdeps
Author: schizo
Date: 2006-03-09 00:36:57 +0000 (Thu, 09 Mar 2006)
New Revision: 1271
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.init
glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.install
glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.manpages
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/rules
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
Log:
get glibc 2.4 to build on sparc
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-03-09 00:36:57 UTC (rev 1271)
@@ -1,3 +1,9 @@
+glibc (2.3.999-1) UNRELEASED; urgency=low
+
+ * 2.4
+
+ -- Clint Adams <schizo@debian.org> Mon, 6 Mar 2006 16:49:38 -0500
+
glibc (2.3.6-4) UNRELEASED; urgency=low
* Set configure_build to the same value as configure_host for sparc
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.init 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.init 2006-03-09 00:36:57 UTC (rev 1271)
@@ -26,10 +26,10 @@
secure=""
for table in passwd group
do
- if egrep '^'$table':.*nisplus' /etc/nsswitch.conf >/dev/null
- then
- /usr/sbin/nscd_nischeck $table ||
- secure="$secure -S $table,yes"
+# if egrep '^'$table':.*nisplus' /etc/nsswitch.conf >/dev/null
+# then
+# /usr/sbin/nscd_nischeck $table ||
+# secure="$secure -S $table,yes"
fi
done
echo -n "Starting Name Service Cache Daemon: nscd"
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.install
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.install 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.install 2006-03-09 00:36:57 UTC (rev 1271)
@@ -1,4 +1,3 @@
debian/tmp-libc/usr/sbin/nscd usr/sbin
-debian/tmp-libc/usr/sbin/nscd_nischeck usr/sbin
DEB_SRCDIR/nscd/nscd.conf /etc
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.manpages
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.manpages 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/nscd.manpages 2006-03-09 00:36:57 UTC (rev 1271)
@@ -1,3 +1,2 @@
debian/local/manpages/nscd.conf.5
debian/local/manpages/nscd.8
-debian/local/manpages/nscd_nischeck.8
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-03-09 00:36:57 UTC (rev 1271)
@@ -1,3 +1,5 @@
+localedata/cvs-localedata.diff -p0
+cvs-tzdata.diff -p0
localedata/locale-de_CH.diff -p1
locale-ru_RU.diff -p1
localedata/locale-eo_EO.diff -p1
@@ -9,13 +11,13 @@
ldd.diff -p0
fhs-linux-paths.diff -p1
glibc22-nss-upgrade.diff -p1
-glibc22-m68k-compat.diff -p1
-glibc22-m68k-fpic.diff -p1
+#glibc22-m68k-compat.diff -p1
+#glibc22-m68k-fpic.diff -p1
sparc64-fixups.diff -p1
glibc22-ttyname-devfs.diff -p0
powerpc-sysconf.diff -p1
-arm-no-hwcap.diff -p0
-librt-mips.diff -p0
+#arm-no-hwcap.diff -p0
+#librt-mips.diff -p0
#glibc23-ctype-compat.diff -p1 # g: untilsarge
glibc23-hppa-Rminkernel.diff -p0
#glibc23-function-compat.diff -p1 # g: untilsarge
@@ -23,68 +25,71 @@
glibc23-asserth-decls.diff -p0
#alpha-pic.diff -p0 # g: suspended
glibc23-cmov.diff -p0
-libgcc-compat-all.diff -p0
-libgcc-compat-other.diff -p1
+#libgcc-compat-all.diff -p0
+#libgcc-compat-other.diff -p1
hurd-enable-ldconfig.diff -p1
#30_glibc232-base.diff -p0 # g: suspended
sparcv8-target.diff -p0
50_glibc232-arm-dwarf2-buildfix.diff -p0
50_glibc232-m68k-dwarf2-buildfix.diff -p0
#arm-output-format.diff -p0 # g: suspended
-arm-ioperm.diff -p0
-arm-float-byteorder.diff -p0
+#arm-ioperm.diff -p0
+#arm-float-byteorder.diff -p0
#glibc-make-check-perms.diff -p1 # g: suspended
glibc-2.3.2-ldconfig-tls.diff -p1
-glibc23-mips-msq.diff -p0
-ldso-disable-hwcap.diff -p0
-glibc23-version-sanity.diff -p1
-glibc23-sse-oldkernel.diff -p0
+#glibc23-mips-msq.diff -p0
+#ldso-disable-hwcap.diff -p0
+#glibc23-version-sanity.diff -p1
+#glibc23-sse-oldkernel.diff -p0
#glibc23-errno-hack.diff -p1 # g: untilsarge
90_glibc233_tcsetaddr.diff -p1
localedef-fix-trampoline.diff -p1
localedata/locale-eu_FR.diff -p0
-glibc232-m68k-reloc.diff -p1
+#glibc232-m68k-reloc.diff -p1
#glibc232-globfree-clear.diff -p1 # g: suspended
-hppa-drop-utimes.diff -p1
-glibc234-alpha-xstat.diff -p0
-glibc234-hppa-linesep.diff -p0
+#hppa-drop-utimes.diff -p1
+#glibc234-alpha-xstat.diff -p0
+#glibc234-hppa-linesep.diff -p0
#glibc234-hppa-remove-mallocdef.diff -p0 # g: this should be replaced by Carlos' new patch.
-linuxthreads-sizefix.diff -p1
-glibc232-tls-crashfix.diff -p1
+#linuxthreads-sizefix.diff -p1
+#glibc232-tls-crashfix.diff -p1
glibc23-mips-lazy-eval.diff -p2
-glibc235-gcc4-elf.diff -p0
+#glibc235-gcc4-elf.diff -p0
glibc235-gcc4-wcstol_l.diff -p1
glibc235-gcc4-ppc-procfs.diff -p0
-glibc235-gcc4-arm-inline.diff -p1
-glibc235-gcc4-sparc-mv8.diff -p0
-glibc235-gcc4-mips-inline.diff -p0
-glibc235-gcc4-mips-sysdeps.diff -p0
-hurd-ioctl-pfinet.diff -p0
-glibc235-hppa-lt.diff -p1
-glibc235-hppa-sysdeps.diff -p1
-glibc235-gcc4-sparc-inline.diff -p0
-glibc235-gcc4-alpha-profile.diff -p0
-glibc235-gcc34-m68k-seccomment.diff -p0
+#glibc235-gcc4-arm-inline.diff -p1
+#glibc235-gcc4-sparc-mv8.diff -p0
+#glibc235-gcc4-mips-inline.diff -p0
+#glibc235-gcc4-mips-sysdeps.diff -p0
+#hurd-ioctl-pfinet.diff -p0
+#glibc235-hppa-lt.diff -p1
+#glibc235-hppa-sysdeps.diff -p1
+#glibc235-gcc4-sparc-inline.diff -p0
+#glibc235-gcc4-alpha-profile.diff -p0
+#glibc235-gcc34-m68k-seccomment.diff -p0
+locale/cvs-iso4217.diff -p0
+locale/cvs-iso639.diff -p0
locale/iso4217-RON.diff -p0
localedata/locale-ro_RO.diff -p0
-glibc235-gcc4-hppa-profile.diff -p0
+#glibc235-gcc4-hppa-profile.diff -p0
glibc235-dl-execstack.diff -p0
i386-amd64-biarch.diff -p1
-hppa-iitlbp.diff -p1
-hppa-fenv-align.diff -p1
-glibc235-hppa-fpu.diff -p1
-eh-frame-terminator.diff -p1
-sparc-socket-weakalias.diff -p0
-powerpc-socket-weakalias.diff -p0
-arm-socket-weakalias.diff -p0
-divdi3-moddi3.diff -p0
-powerpc-executable-got.diff -p0
-ctan.diff -p0
-glibc-235-sparc-datastart.diff -p0
-glibc235-dash.diff -p0
-glibc235-nis-netgrp.diff
+#hppa-iitlbp.diff -p1
+#hppa-fenv-align.diff -p1
+#glibc235-hppa-fpu.diff -p1
+#eh-frame-terminator.diff -p1
+#sparc-socket-weakalias.diff -p0
+#powerpc-socket-weakalias.diff -p0
+#arm-socket-weakalias.diff -p0
+#divdi3-moddi3.diff -p0
+#powerpc-executable-got.diff -p0
+#ctan.diff -p0
+#glibc-235-sparc-datastart.diff -p0
+#glibc235-dash.diff -p0
+#glibc235-nis-netgrp.diff
localedata/locale-ku_TR.diff -p0
#localedata/discard-dz_BT.diff # not needed when complex-collate is applied
+locale/complex-collate.diff
locale/fix-exhausted-memory.diff
#locale/check-unknown-symbols.diff # locales have to be fixed first
locale/fix-LC_COLLATE-rules.diff
@@ -116,16 +121,16 @@
localedata/fix-unknown-symbols.diff
localedata/first_weekday.diff -p0
localedata/sort-UTF8-first.diff -p0
-hppa-pie-relocs.diff -p1
-hurd-getresuid-dyslexia.diff -p0
-hppa-no-ldbl-128.diff -p1
-glibc-manual-memory.diff -p1
+#hppa-pie-relocs.diff -p1
+#hurd-getresuid-dyslexia.diff -p0
+#hppa-no-ldbl-128.diff -p1
+#glibc-manual-memory.diff -p1
hurd-ioctl-decode-argument.diff -p0
-glibc-manual-string.diff -p1
+#glibc-manual-string.diff -p1
ld-multiarch.diff -p1
ldconfig-multiarch.diff -p1
-rtld.diff -p1
-resource_h.diff -p1
-hppa-inlining.diff -p1
-regcomp_c.diff -p1
-tst-setcontext_c.diff -p1
+#rtld.diff -p1
+#resource_h.diff -p1
+#hppa-inlining.diff -p1
+#regcomp_c.diff -p1
+#tst-setcontext_c.diff -p1
Modified: glibc-package/branches/glibc-2.4/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/rules 2006-03-09 00:36:57 UTC (rev 1271)
@@ -129,7 +129,7 @@
endef
# Include libidn for both NPTL and LinuxThreads targets.
-standard-add-ons = libidn,
+standard-add-ons = nptl,libidn,
# Pull in all the per-arch magic!
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-09 00:36:57 UTC (rev 1271)
@@ -19,8 +19,8 @@
# Some per-package extra files to install.
define $(libc)_extra_debhelper_pkg_install
install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
- install --mode=0644 $(DEB_SRCDIR)/linuxthreads/README debian/$(curpass)/usr/share/doc/$(curpass)/README.linuxthreads
- install --mode=0644 $(DEB_SRCDIR)/linuxthreads/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.linuxthreads
+# install --mode=0644 $(DEB_SRCDIR)/linuxthreads/README debian/$(curpass)/usr/share/doc/$(curpass)/README.linuxthreads
+# install --mode=0644 $(DEB_SRCDIR)/linuxthreads/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.linuxthreads
case " $(GLIBC_PASSES) " in \
*" nptl "*) \
install --mode=0644 $(DEB_SRCDIR)/nptl/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.nptl; \
@@ -42,7 +42,7 @@
define glibc-doc_extra_debhelper_pkg_install
install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
- install --mode=0644 $(DEB_SRCDIR)/linuxthreads/FAQ.html debian/$(curpass)/usr/share/doc/$(curpass)/FAQ.linuxthreads.html
+# install --mode=0644 $(DEB_SRCDIR)/linuxthreads/FAQ.html debian/$(curpass)/usr/share/doc/$(curpass)/FAQ.linuxthreads.html
endef
# Should each of these have per-package options?
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-03-09 00:36:57 UTC (rev 1271)
@@ -1,4 +1,5 @@
-GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
+#GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*)
+GLIBC_OVERLAYS ?= $(shell ls glibc-ports* glibc-libidn*)
MIN_KERNEL_SUPPORTED := 2.2.0
libc = libc6
@@ -21,7 +22,8 @@
# Linuxthreads Config
threads = yes
-libc_add-ons = linuxthreads $(add-ons)
+#libc_add-ons = linuxthreads $(add-ons)
+libc_add-ons = $(add-ons)
ifndef LINUX_SOURCE
LINUX_HEADERS := /usr/include
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-03-06 22:19:00 UTC (rev 1270)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-03-09 00:36:57 UTC (rev 1271)
@@ -5,8 +5,8 @@
sparc64_configure_target=sparc64-linux
sparc64_CC = $(BUILD_CC) -m64
sparc64_extra_cflags = -g1 -O3
-sparc64_extra_config_options = $(extra_config_options) --disable-profile --without-__thread --without-tls
-sparc64_add-ons = linuxthreads $(add-ons)
+sparc64_extra_config_options = $(extra_config_options) --disable-profile
+sparc64_add-ons = nptl $(add-ons)
libc6-sparc64_shlib_dep = libc6-sparc64 (>= $(shlib_dep_ver))
sparc64_slibdir = /lib64
sparc64_libdir = /usr/lib64
@@ -16,7 +16,7 @@
sparcv9_configure_build=sparcv9-linux
sparcv9_extra_cflags = -g1 -O3
sparcv9_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9_add-ons = linuxthreads $(add-ons)
+sparcv9_add-ons = nptl $(add-ons)
sparcv9_rtlddir = /lib
sparcv9_slibdir = /lib/v9
@@ -25,6 +25,6 @@
sparcv9b_configure_build=sparcv9b-linux
sparcv9b_extra_cflags = -g1 -O3
sparcv9b_extra_config_options = $(extra_config_options) --disable-profile
-sparcv9b_add-ons = linuxthreads $(add-ons)
+sparcv9b_add-ons = nptl $(add-ons)
sparcv9b_rtlddir = /lib
sparcv9b_slibdir = /lib/ultra3
Reply to: