The following commit has been merged in the master branch:
commit 8cf1ec6108d944eaecbdca7a9b52f92ee0db6a8b
Author: Guillem Jover <[email protected]>
Date:   Sat Sep 26 07:02:41 2009 +0200

    Dynamically link against all external libraries
    
    This includes libbz2 and zlib for dpkg-deb and and libselinux for
    dpkg on GNU/Linux.

diff --git a/debian/changelog b/debian/changelog
index 3da5ca1..1f79c21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -124,6 +124,8 @@ dpkg (1.15.6) UNRELEASED; urgency=low
     The proper solution to this is to let the build system choose the
     appropriate pkg-config binary for the build or host system in the same
     way pkg.m4 is handling it now. Closes: #551118
+  * Dynamically link against all external libraries. This includes libbz2
+    and zlib for dpkg-deb and and libselinux for dpkg on GNU/Linux.
 
   [ Modestas Vainius ]
   * Implement symbol patterns (Closes: #563752). From now on, it is possible to
diff --git a/debian/dpkg.lintian-overrides b/debian/dpkg.lintian-overrides
index cbbb25e..6b75f54 100644
--- a/debian/dpkg.lintian-overrides
+++ b/debian/dpkg.lintian-overrides
@@ -1,8 +1,6 @@
 dpkg: redundant-origin-field
 dpkg: redundant-bugs-field
 dpkg: arch-dep-package-has-big-usr-share
-# By design, to be able to recover from broken/missing zlib
-dpkg: embedded-zlib ./usr/bin/dpkg-deb
 # False positives, we read from a file not from a tty
 dpkg: read-in-maintainer-script preinst:39
 dpkg: read-in-maintainer-script preinst:40
diff --git a/debian/rules b/debian/rules
index 6fc0ee4..14edffb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,7 @@ endif
 DEB_HOST_ARCH_OS  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
-       confflags += --with-selinux=static
+       confflags += --with-selinux
 endif
 
 
@@ -54,8 +54,8 @@ build-tree/config.status: configure
                --infodir=\$${datadir}/info \
                --sysconfdir=/etc \
                --localstatedir=/var/lib \
-               --with-zlib=static \
-               --with-bz2=static
+               --with-zlib \
+               --with-bz2
 
 # Build the package in build-tree
 build: build-tree/config.status

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to