r1497 - in glibc-package/trunk/debian: . debhelper.in rules.d sysdeps
Author: aurel32
Date: 2006-05-21 07:11:54 +0000 (Sun, 21 May 2006)
New Revision: 1497
Added:
glibc-package/trunk/debian/sysdeps/mips.mk
glibc-package/trunk/debian/sysdeps/mipsel.mk
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc-udeb.install
glibc-package/trunk/debian/debhelper.in/libnss-dns-udeb.install
glibc-package/trunk/debian/debhelper.in/libnss-files-udeb.install
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/sysdeps/hurd.mk
glibc-package/trunk/debian/sysdeps/i386.mk
glibc-package/trunk/debian/sysdeps/kfreebsd.mk
glibc-package/trunk/debian/sysdeps/linux.mk
glibc-package/trunk/debian/sysdeps/m68k.mk
glibc-package/trunk/debian/sysdeps/powerpc.mk
glibc-package/trunk/debian/sysdeps/s390.mk
Log:
* Do a separate pass for the udeb package, so that it could use different
build options.
* Set the minimum kernel to 2.6.1 for the udeb package, except for i386,
m68k, mips, mipsel, powerpc and s390.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/changelog 2006-05-21 07:11:54 UTC (rev 1497)
@@ -6,6 +6,10 @@
* Add patches/arm/local-softfloat.diff (support for arm softfloat). (Closes:
#358772)
* debian/rules.d/control.mk: Add arm-softfloat to the architectures list.
+ * Do a separate pass for the udeb package, so that it could use different
+ build options.
+ * Set the minimum kernel to 2.6.1 for the udeb package, except for i386,
+ m68k, mips, mipsel, powerpc and s390.
-- Aurelien Jarno <aurel32@debian.org> Fri, 19 May 2006 05:49:18 +0000
Modified: glibc-package/trunk/debian/debhelper.in/libc-udeb.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-udeb.install 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/debhelper.in/libc-udeb.install 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,13 +1,13 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/ld*.so* lib
-debian/tmp-libc/lib/libm-*.so* lib
-debian/tmp-libc/lib/libm.so* lib
-debian/tmp-libc/lib/libdl*.so* lib
-debian/tmp-libc/lib/libresolv*.so* lib
-debian/tmp-libc/lib/libc-*.so* lib
-debian/tmp-libc/lib/libc.so* lib
-debian/tmp-libc/lib/libutil* lib
-debian/tmp-libc/lib/libcrypt* lib
+debian/tmp-udeb/lib/ld*.so* lib
+debian/tmp-udeb/lib/libm-*.so* lib
+debian/tmp-udeb/lib/libm.so* lib
+debian/tmp-udeb/lib/libdl*.so* lib
+debian/tmp-udeb/lib/libresolv*.so* lib
+debian/tmp-udeb/lib/libc-*.so* lib
+debian/tmp-udeb/lib/libc.so* lib
+debian/tmp-udeb/lib/libutil* lib
+debian/tmp-udeb/lib/libcrypt* lib
# FIXME: This should be with_threads arch's only.
-debian/tmp-libc/lib/libpthread*.so* lib
+debian/tmp-udeb/lib/libpthread*.so* lib
Modified: glibc-package/trunk/debian/debhelper.in/libnss-dns-udeb.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libnss-dns-udeb.install 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/debhelper.in/libnss-dns-udeb.install 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,3 +1,3 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/libnss_dns*.so* lib
+debian/tmp-udeb/lib/libnss_dns*.so* lib
Modified: glibc-package/trunk/debian/debhelper.in/libnss-files-udeb.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libnss-files-udeb.install 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/debhelper.in/libnss-files-udeb.install 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,3 +1,3 @@
# FIXME: someday we may need to handle installing into non-lib.
-debian/tmp-libc/lib/libnss_files*.so* lib
+debian/tmp-udeb/lib/libnss_files*.so* lib
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/rules 2006-05-21 07:11:54 UTC (rev 1497)
@@ -86,7 +86,7 @@
endif
# Default setup
-GLIBC_PASSES ?= libc
+GLIBC_PASSES ?= libc udeb
prefix=/usr
bindir=$(prefix)/bin
@@ -98,6 +98,10 @@
sbindir=$(prefix)/sbin
libexecdir=$(prefix)/lib
+udeb_add-ons = linuxthreads $(add-ons)
+udeb_rtlddir = /lib
+udeb_slibdir = /lib
+
BUILD_CC = gcc-4.0
RUN_TESTSUITE = yes
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -167,7 +167,7 @@
# say "include this in the main library" by setting a variable.
# But after 10 hours of staring at this thing, I can't figure it out.
-OPT_PASSES = $(filter-out libc nptl,$(GLIBC_PASSES))
+OPT_PASSES = $(filter-out libc nptl udeb,$(GLIBC_PASSES))
OPT_DIRS = $(foreach pass,$(OPT_PASSES),$($(pass)_slibdir) $($(pass)_libdir))
NPTL = $(filter nptl,$(GLIBC_PASSES))
Modified: glibc-package/trunk/debian/sysdeps/hurd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/hurd.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/hurd.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -6,6 +6,10 @@
libc = libc0.3
slibdir = /lib
+# udeb Config
+#udeb_extra_cflags = -Os
+udeb_extra_config_options := $(extra_config_options) --without-tls libc_cv_z_relro=no
+
# Glibc should really do this for us.
define libc_extra_install
mkdir -p debian/tmp-$(curpass)/lib
Modified: glibc-package/trunk/debian/sysdeps/i386.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/i386.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,6 +1,8 @@
GLIBC_PASSES += nptl i686 xen
DEB_ARCH_REGULAR_PACKAGES += libc6-i686 libc6-xen
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+
# Starting with libc6 2.3.6-6 TLS support is enabled
libc6_shlib_dep = libc6 (>= 2.3.6-6)
Modified: glibc-package/trunk/debian/sysdeps/kfreebsd.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/kfreebsd.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -20,6 +20,10 @@
# Minimum Kernel supported
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
+# udeb Config
+#udeb_extra_cflags = -Os
+udeb_MIN_KERNEL_SUPPORTED := 5.4.0
+
KERNEL_HEADER_DIR = $(stamp)mkincludedir
$(stamp)mkincludedir:
rm -rf debian/include
Modified: glibc-package/trunk/debian/sysdeps/linux.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/linux.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -19,6 +19,10 @@
# Minimum Kernel supported
with_headers = --with-headers=$(shell pwd)/debian/include --enable-kernel=$(call xx,MIN_KERNEL_SUPPORTED)
+# udeb Config
+#udeb_extra_cflags = -Os
+udeb_MIN_KERNEL_SUPPORTED = 2.6.1
+
# NPTL Config
nptl_add-ons = nptl $(add-ons)
nptl_extra_config_options = $(extra_config_options) --disable-profile
Modified: glibc-package/trunk/debian/sysdeps/m68k.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/m68k.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/m68k.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,6 +1,8 @@
# m68k cannot be compiled with >= 2.4.xx
MIN_KERNEL_SUPPORTED := 2.2.0
+udeb_MIN_KERNEL_SUPPORTED = 2.2.0
+
# work around to build on m68k, due to gcc-4.0 ICE. See #319312.
CC = gcc-3.4
BUILD_CC = gcc-3.4
Added: glibc-package/trunk/debian/sysdeps/mips.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mips.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/mips.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -0,0 +1 @@
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Added: glibc-package/trunk/debian/sysdeps/mipsel.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/mipsel.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/mipsel.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -0,0 +1 @@
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
Modified: glibc-package/trunk/debian/sysdeps/powerpc.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/powerpc.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,6 +1,8 @@
GLIBC_PASSES += ppc64 nptl
DEB_ARCH_REGULAR_PACKAGES += libc6-ppc64 libc6-dev-ppc64
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+
ppc64_MIN_KERNEL_SUPPORTED = 2.6.0
ppc64_configure_target = powerpc64-linux
ppc64_CC = $(CC) -m64
Modified: glibc-package/trunk/debian/sysdeps/s390.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/s390.mk 2006-05-20 06:31:03 UTC (rev 1496)
+++ glibc-package/trunk/debian/sysdeps/s390.mk 2006-05-21 07:11:54 UTC (rev 1497)
@@ -1,7 +1,8 @@
GLIBC_PASSES += nptl s390x
DEB_ARCH_REGULAR_PACKAGES += libc6-s390x libc6-dev-s390x
-s390x_MIN_KERNEL_SUPPORTED = 2.4.1
+udeb_MIN_KERNEL_SUPPORTED = 2.4.1
+
s390x_configure_target = s390x-linux
s390x_CC = $(CC) -m64
s390x_add-ons = linuxthreads $(add-ons)
Reply to: