[Reproducible-commits] [dpkg] 69/74: build: Use libmd auotmatically if available
Mattia Rizzolo
mattia at debian.org
Sun Jul 3 22:22:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to annotated tag 1.18.8
in repository dpkg.
commit 785c8a5f78ef757836884ed1acbf6e9171822a53
Author: Guillem Jover <guillem at debian.org>
Date: Sun Jun 26 01:53:31 2016 +0200
build: Use libmd auotmatically if available
Disable it for Debian packages for now, as this would pull the library
into the pseudo-essential set and requires discussion in debian-devel.
---
README | 1 +
debian/changelog | 3 +++
debian/rules | 1 +
m4/dpkg-libs.m4 | 4 ----
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/README b/README
index 5607212..4904670 100644
--- a/README
+++ b/README
@@ -66,6 +66,7 @@ The minimum software required to configure and build dpkg from a tarball is:
To enable optional functionality or programs, this software might be needed:
+ libmd (used by libdpkg, currently falling back to embedded code)
zlib (used instead of gzip command-line tool)
xz's liblzma (used instead of xz command-line tool)
libbzip2 (used instead of bzip2 command-line tool)
diff --git a/debian/changelog b/debian/changelog
index 06d2ccc..1346cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -82,8 +82,11 @@ dpkg (1.18.8) UNRELEASED; urgency=medium
- Preset Last-Update field in patch header template with current time in
Dpkg::Source::Package::V2. Thanks to Daniel Shahaf <danielsh at apache.org>.
Closes: #828146
+ * Packaging:
+ - Disable libmd usage in Debian and derivatives for now.
* Build system:
- Stop allowing to set deprecated bzip2 compressor as dpkg-deb default.
+ - Use libmd automatically if available.
* Test suite:
- Bump perlcritic ValuesAndExpressions::RequireNumberSeparators minimum
to 99999.
diff --git a/debian/rules b/debian/rules
index 146f3c2..cee57d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,7 @@ build-tree/config.status: configure
--sbindir=/sbin \
--localstatedir=/var \
--with-devlibdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --without-libmd \
--with-zlib \
--with-liblzma \
--with-bz2
diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index 9fc3720..3b6924a 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -10,10 +10,6 @@ AC_DEFUN([DPKG_LIB_MD], [
AC_ARG_WITH([libmd], [
AS_HELP_STRING([--with-libmd],
[use libmd library for message digest functions])
- ], [
- with_libmd="$withval"
- ], [
- with_libmd="no"
])
if test "x$with_libmd" != "xno"; then
AC_CHECK_HEADERS([md5.h], [
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list