Author: schizo Date: 2006-03-11 01:02:48 +0000 (Sat, 11 Mar 2006) New Revision: 1289
Modified: 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: revert changes to build without linuxthreads, as we are going to be shipping linuxthreads in the .orig.tar.gz Modified: glibc-package/branches/glibc-2.4/debian/rules =================================================================== --- glibc-package/branches/glibc-2.4/debian/rules 2006-03-11 00:56:46 UTC (rev 1288) +++ glibc-package/branches/glibc-2.4/debian/rules 2006-03-11 01:02:48 UTC (rev 1289) @@ -129,7 +129,7 @@ endef # Include libidn for both NPTL and LinuxThreads targets. -standard-add-ons = nptl,libidn, +standard-add-ons = 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-11 00:56:46 UTC (rev 1288) +++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-03-11 01:02:48 UTC (rev 1289) @@ -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-11 00:56:46 UTC (rev 1288) +++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-03-11 01:02:48 UTC (rev 1289) @@ -1,5 +1,4 @@ -#GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*) -GLIBC_OVERLAYS ?= $(shell ls glibc-ports* glibc-libidn*) +GLIBC_OVERLAYS ?= $(shell ls glibc-linuxthreads* glibc-ports* glibc-libidn*) MIN_KERNEL_SUPPORTED := 2.2.0 libc = libc6 @@ -22,8 +21,7 @@ # Linuxthreads Config threads = yes -#libc_add-ons = linuxthreads $(add-ons) -libc_add-ons = $(add-ons) +libc_add-ons = linuxthreads $(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-11 00:56:46 UTC (rev 1288) +++ glibc-package/branches/glibc-2.4/debian/sysdeps/sparc.mk 2006-03-11 01:02:48 UTC (rev 1289) @@ -6,7 +6,7 @@ sparc64_CC = $(BUILD_CC) -m64 sparc64_extra_cflags = -g1 -O3 sparc64_extra_config_options = $(extra_config_options) --disable-profile -sparc64_add-ons = nptl $(add-ons) +sparc64_add-ons = linuxthreads $(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 = nptl $(add-ons) +sparcv9_add-ons = linuxthreads $(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 = nptl $(add-ons) +sparcv9b_add-ons = linuxthreads $(add-ons) sparcv9b_rtlddir = /lib sparcv9b_slibdir = /lib/ultra3 -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]