r1698 - in glibc-package/branches/glibc-2.4/debian: rules.d sysdeps
Author: aurel32
Date: 2006-08-02 10:17:09 +0000 (Wed, 02 Aug 2006)
New Revision: 1698
Modified:
glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
Log:
Remove NPTL pass support
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-08-02 09:20:48 UTC (rev 1697)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/debhelper.mk 2006-08-02 10:17:09 UTC (rev 1698)
@@ -169,7 +169,6 @@
OPT_PASSES = $(filter-out libc nptl, $(GLIBC_PASSES))
OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
-NPTL = $(filter nptl,$(GLIBC_PASSES))
debhelper: $(stamp)debhelper
$(stamp)debhelper:
@@ -188,9 +187,6 @@
case $$z in \
*.install) \
sed -e "s/^#.*//" -i $$z ; \
- if [ -z "$(NPTL)" ] ; then \
- sed -i "/^.*nptl.*/d" $$z ; \
- fi ; \
if [ $(DEB_HOST_ARCH) != $(DEB_BUILD_ARCH) ]; then \
sed -i "/^.*librpcsvc.a.*/d" $$z ; \
fi ; \
@@ -245,24 +241,6 @@
sed -e "s/^#.*//" -i $$z; \
done
- # We use libc-otherbuild for this, since it's just a special case of
- # an optimised library that needs to wind up in /lib/tls
- # FIXME: We do not cover the case of processor optimised
- # nptl libraries, like /lib/i686/tls
- # We probably don't care for now.
- for x in $(NPTL); do \
- z=debian/$(libc).install; \
- cat debian/debhelper.in/libc-otherbuild.install >>$$z; \
- sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$z; \
- sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#g" -i $$z; \
- sed -e "s#LIBC-FLAVOR#$(libc)#g" -i $$z; \
- sed -e "s#FLAVOR#nptl#g" -i $$z; \
- sed -e "s#SLIBDIR#/lib/tls#g" -i $$z; \
- case $$z in \
- *.install) sed -e "s/^#.*//g" -i $$z ;; \
- esac; \
- done
-
# Substitute __SUPPORTED_LOCALES__.
perl -i -pe 'BEGIN {undef $$/; open(IN, "debian/tmp-libc/usr/share/i18n/SUPPORTED"); $$j=<IN>;} s/__SUPPORTED_LOCALES__/$$j/g;' debian/locales.config
Modified: glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-08-02 09:20:48 UTC (rev 1697)
+++ glibc-package/branches/glibc-2.4/debian/sysdeps/linux.mk 2006-08-02 10:17:09 UTC (rev 1698)
@@ -20,14 +20,6 @@
# Minimum Kernel supported
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
-# NPTL Config
-nptl_add-ons = nptl $(add-ons)
-nptl_extra_config_options = $(extra_config_options) --disable-profile
-nptl_extra_cflags = -g1 -O3
-nptl_rtlddir = /lib
-nptl_slibdir = /lib/tls
-nptl_MIN_KERNEL_SUPPORTED = 2.6.0
-
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
rm -rf debian/include
Reply to: