Control: tag -1 + patch Hi, The attached patch adds memusage and memusagestat to the libc-bin package. This does mean that the latter becomes dependent on libgd3, so it might be better to add a new memusage package; I can take care of that if the maintainers think it’s better. Regards, Stephen
From c2bc49abc1dfba93609544378f3f65dec1b98a7c Mon Sep 17 00:00:00 2001 From: Stephen Kitt <skitt@debian.org> Date: Tue, 21 Apr 2020 20:55:53 +0200 Subject: [PATCH] Build and package memusage* This builds memusage and memusagestat in the libc pass, and ships them in libc-bin. This involves adding a build-dependency on libgd-dev (outside stage1) and libc-bin acquires a runtime dependency on the corresponding library package. Closes: #91815 Signed-off-by: Stephen Kitt <skitt@debian.org> --- debian/control.in/main | 4 +++- debian/debhelper.in/libc-bin.install | 2 ++ debian/debhelper.in/libc-bin.lintian-overrides | 2 ++ debian/rules.d/build.mk | 6 +++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/control.in/main b/debian/control.in/main index 659267bd..3ff82664 100644 --- a/debian/control.in/main +++ b/debian/control.in/main @@ -12,7 +12,8 @@ Build-Depends: gettext, dpkg (>= 1.18.7), dpkg-dev (>= 1.17.14), xz-utils, file, g++-9, g++-9-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el mipsr6 mipsr6el mipsn32r6 mipsn32r6el mips64r6 mips64r6el powerpc ppc64 s390x sparc sparc64 x32] <!nobiarch>, python3:native, libidn2-0 (>= 2.0.5~) <!nocheck>, - libc-bin (>= @GLIBC_VERSION@) <cross> + libc-bin (>= @GLIBC_VERSION@) <cross>, + libgd-dev <!stage1> Build-Depends-Indep: perl, po-debconf (>= 1.0) Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org> Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>, Samuel Thibault <sthibault@debian.org> @@ -39,6 +40,7 @@ Description: GNU C Library: Binaries * iconv, iconvconfig: convert between character encodings * ldd, ldconfig: print/configure shared library dependencies * locale, localedef: show/generate locale definitions + * memusage, memusagestat: measure memory usage * tzselect, zdump, zic: select/dump/compile time zones Package: libc-dev-bin diff --git a/debian/debhelper.in/libc-bin.install b/debian/debhelper.in/libc-bin.install index dfab166b..a76d191f 100644 --- a/debian/debhelper.in/libc-bin.install +++ b/debian/debhelper.in/libc-bin.install @@ -12,6 +12,8 @@ debian/tmp-libc/usr/bin/iconv usr/bin debian/tmp-libc/usr/bin/ldd usr/bin debian/tmp-libc/usr/bin/localedef usr/bin debian/tmp-libc/usr/bin/locale usr/bin +debian/tmp-libc/usr/bin/memusage usr/bin +debian/tmp-libc/usr/bin/memusagestat usr/bin debian/tmp-libc/usr/bin/pldd usr/bin debian/tmp-libc/usr/bin/tzselect usr/bin debian/tmp-libc/usr/lib/pt_chown usr/lib diff --git a/debian/debhelper.in/libc-bin.lintian-overrides b/debian/debhelper.in/libc-bin.lintian-overrides index 01eb456c..ba411883 100644 --- a/debian/debhelper.in/libc-bin.lintian-overrides +++ b/debian/debhelper.in/libc-bin.lintian-overrides @@ -17,6 +17,8 @@ libc-bin: binary-without-manpage usr/bin/iconv libc-bin: binary-without-manpage usr/bin/ldd libc-bin: binary-without-manpage usr/bin/locale libc-bin: binary-without-manpage usr/bin/localedef +libc-bin: binary-without-manpage usr/bin/memusage +libc-bin: binary-without-manpage usr/bin/memusagestat libc-bin: binary-without-manpage usr/bin/pldd libc-bin: binary-without-manpage usr/bin/zdump libc-bin: binary-without-manpage usr/sbin/iconvconfig diff --git a/debian/rules.d/build.mk b/debian/rules.d/build.mk index 0d03116a..3f664316 100644 --- a/debian/rules.d/build.mk +++ b/debian/rules.d/build.mk @@ -37,7 +37,11 @@ $(stamp)configure_%: $(stamp)config_sub_guess $(stamp)patch $(KERNEL_HEADER_DIR) echo "BASH := /bin/bash" >> $(DEB_BUILDDIR)/configparms echo "KSH := /bin/bash" >> $(DEB_BUILDDIR)/configparms echo "SHELL := /bin/bash" >> $(DEB_BUILDDIR)/configparms - echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms + if [ "$(curpass)" = "libc" ]; then \ + echo "LIBGD = yes" >> $(DEB_BUILDDIR)/configparms; \ + else \ + echo "LIBGD = no" >> $(DEB_BUILDDIR)/configparms; \ + fi echo "bindir = $(bindir)" >> $(DEB_BUILDDIR)/configparms echo "datadir = $(datadir)" >> $(DEB_BUILDDIR)/configparms echo "complocaledir = $(complocaledir)" >> $(DEB_BUILDDIR)/configparms -- 2.20.1
Attachment:
pgpDDWo6r2nfH.pgp
Description: OpenPGP digital signature