Преглед изворни кода

Dynamically link against all external libraries

This includes libbz2 and zlib for dpkg-deb and and libselinux for
dpkg on GNU/Linux.
Guillem Jover пре 17 година
родитељ
комит
8cf1ec6108
3 измењених фајлова са 5 додато и 5 уклоњено
  1. 2 0
      debian/changelog
  2. 0 2
      debian/dpkg.lintian-overrides
  3. 3 3
      debian/rules

+ 2 - 0
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

+ 0 - 2
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

+ 3 - 3
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