r3744 - in glibc-package/trunk/debian: . control.in rules.d sysdeps
Author: aurel32
Date: 2009-08-09 19:11:13 +0000 (Sun, 09 Aug 2009)
New Revision: 3744
Removed:
glibc-package/trunk/debian/sysdeps/depflags.mk
glibc-package/trunk/debian/sysdeps/depflags.pl
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/control.mk
Log:
* Replace debian/sysdeps/depflags.{mk,pl} by entries in debian/control
using the "new" dpkg-dev features. Clean-out some very old entries.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-08-09 19:06:36 UTC (rev 3743)
+++ glibc-package/trunk/debian/changelog 2009-08-09 19:11:13 UTC (rev 3744)
@@ -2,6 +2,8 @@
[ Aurelien Jarno ]
* Remove any/cvs-pthread_mutex_lock.diff following upstream decision.
+ * Replace debian/sysdeps/depflags.{mk,pl} by entries in debian/control
+ using the "new" dpkg-dev features. Clean-out some very old entries.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2696 (from glibc-bsd).
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2009-08-09 19:06:36 UTC (rev 3743)
+++ glibc-package/trunk/debian/control.in/libc 2009-08-09 19:11:13 UTC (rev 3744)
@@ -2,8 +2,11 @@
Architecture: @archs@
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -13,8 +16,11 @@
Architecture: @archs@
Section: libdevel
Priority: optional
-Depends: @libc@ (= ${binary:Version})
+Depends: @libc@ (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2009-08-09 19:06:36 UTC (rev 3743)
+++ glibc-package/trunk/debian/rules 2009-08-09 19:11:13 UTC (rev 3744)
@@ -142,8 +142,6 @@
-include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk
-include debian/sysdeps/$(DEB_HOST_ARCH).mk
-include debian/sysdeps/depflags.mk
-
# Don't run dh_strip on this package
NOSTRIP_$(libc)-dbg = 1
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2009-08-09 19:06:36 UTC (rev 3743)
+++ glibc-package/trunk/debian/rules.d/control.mk 2009-08-09 19:11:13 UTC (rev 3744)
@@ -15,7 +15,7 @@
debian/control: $(stamp)control
$(stamp)control: debian/control.in/main $(control_deps) \
- debian/rules.d/control.mk # debian/sysdeps/depflags.pl
+ debian/rules.d/control.mk
# Check that all files end with a new line
set -e ; for i in debian/control.in/* ; do \
Deleted: glibc-package/trunk/debian/sysdeps/depflags.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.mk 2009-08-09 19:06:36 UTC (rev 3743)
+++ glibc-package/trunk/debian/sysdeps/depflags.mk 2009-08-09 19:11:13 UTC (rev 3744)
@@ -1,25 +0,0 @@
-depflags = libc=$(libc) glibc=glibc \
- DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS) \
- DEB_HOST_ARCH=$(DEB_HOST_ARCH) \
- perl debian/sysdeps/depflags.pl
-
-libc_control_flags = $(shell $(depflags) libc)
-libc_dev_control_flags = $(shell $(depflags) libc_dev)
-
-# If there's a -DDepends for libc-dev, add this to it. If there isn't
-# then the control file's depends line (which contains this) will be used.
-# This is gross and another reason why depflags.pl must die.
-libc_dev_dep = $(libc) (= $(DEB_VERSION)),
-libc_dev_control_flags := $(subst Depends=",Depends="$(libc_dev_dep) ,$(libc_dev_control_flags))
-
-$(libc)_control_flags = $(libc_control_flags)
-$(libc)-dev_control_flags = $(libc_dev_control_flags)
-
-test_depflags:
- @echo
- @echo "$(libc):"
- @echo ' $(libc_control_flags)'
- @echo
- @echo "$(libc)-dev:"
- @echo ' $(libc_dev_control_flags)'
- @echo
Deleted: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2009-08-09 19:06:36 UTC (rev 3743)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2009-08-09 19:11:13 UTC (rev 3744)
@@ -1,85 +0,0 @@
-#!/usr/bin/perl
-
-# These get export by debian/sysdeps/depflags.mk
-$DEB_HOST_ARCH_OS = $ENV{'DEB_HOST_ARCH_OS'};
-$DEB_HOST_ARCH = $ENV{'DEB_HOST_ARCH'};
-$libc = $ENV{'libc'};
-$glibc = $ENV{'glibc'};
-@deptypes = ('Depends', 'Replaces', 'Conflicts', 'Provides',
- 'Suggests');
-
-# Let's make sure we are sane
-if (!defined($DEB_HOST_ARCH_OS) or !defined($DEB_HOST_ARCH) or
- !defined($libc) or !defined($glibc)) {
- die "Could not get all parameters";
-}
-
-@ARGV == 1 or die "Usage: depflags <type>";
-$type = $ARGV[0];
-
-# OS specific stuff
-if ($DEB_HOST_ARCH_OS eq "hurd") {
- push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev (>= 20080607-3)', 'libpthread-stubs0-dev');
- push @{$libc_dev_c{'Replaces'}}, 'glibc2-dev';
- push @{$libc_dev_c{'Conflicts'}}, 'glibc2-dev';
- push @{$libc_c{'Replaces'}}, 'glibc2';
- push @{$libc_c{'Conflicts'}}, 'glibc2';
- push @{$libc_c{'Depends'}}, 'hurd (>= 20070606-1+SVN)';
-}
-if ($DEB_HOST_ARCH_OS eq "linux") {
- push @{$libc_c{'Suggests'}}, 'locales';
- push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
- push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev';
-}
-if ($DEB_HOST_ARCH_OS eq "kfreebsd") {
- push @{$libc_c{'Suggests'}}, 'locales';
- push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
- push @{$libc_dev_c{'Replaces'}}, 'kfreebsd-kernel-headers (<< 0.11)';
- push @{$libc_dev_c{'Depends'}}, 'kfreebsd-kernel-headers (>= 0.11)';
-}
-
-# ${glibc}-doc is suggested by $libc_c and $libc_dev_c.
-push @{$libc_c{'Suggests'}}, "${glibc}-doc";
-push @{$libc_dev_c{'Suggests'}}, "${glibc}-doc";
-push @{$libc_dev_c{'Suggests'}}, "manpages-dev";
-
-# nss-db is now seperate
-push @{$libc_c{'Recommends'}}, 'libnss-db';
-
-## Conflict versions of binutils version that does not support DT_GNU_HASH
-push @{$libc_dev_c{'Conflicts'}}, 'binutils (<< 2.17cvs20070426-1)';
-
-# Make sure we only have one version of libc-dev installed
-push @{$libc_dev_c{'Provides'}}, 'libc-dev';
-push @{$libc_dev_c{'Conflicts'}}, 'libc-dev';
-if ($libc ne "libc6") {
- push @{$libc_dev_c{'Provides'}}, 'libc6-dev';
-}
-
-# Conflict with older versions of tzdata that need tzconfig.
-push @{$libc_c{'Conflicts'}}, 'tzdata (<< 2007k-1), tzdata-etch';
-
-# Conflict with older versions of nscd
-push @{$libc_c{'Conflicts'}}, 'nscd (<< 2.9)';
-
-# Depends on libgcc1/libgcc2/libgcc4
-if ($DEB_HOST_ARCH =~ m/^hppa$/) {
- push @{$libc_c{'Depends'}}, 'libgcc4';
-} elsif ($DEB_HOST_ARCH =~ m/^m68k$/) {
- push @{$libc_c{'Depends'}}, 'libgcc2';
-} else {
- push @{$libc_c{'Depends'}}, 'libgcc1';
-}
-
-if ($type eq "libc") {
- %pkg = %libc_c;
-} elsif ($type eq "libc_dev") {
- %pkg = %libc_dev_c;
-} else {
- die "Unknown package $type";
-}
-
-foreach $dep (@deptypes) {
- next if not defined($pkg{$dep});
- print "-D${dep}=\"" . join(', ', @{$pkg{$dep}}) . "\" ";
-}
Reply to: