diff options
| author | Guillem Jover <guillem@debian.org> | 2015-09-14 16:37:07 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2015-09-14 17:39:54 +0200 |
| commit | 9043cdef192332f3a0fc710731d3bf7e73aaa3aa (patch) | |
| tree | da7ffa295715818f18d0c8b9564225d06c3e7de6 | |
| parent | eae0b17537596dc5589598c4724feb14c5d7e949 (diff) | |
| download | dpkg-9043cdef192332f3a0fc710731d3bf7e73aaa3aa.tar.gz | |
debian: Use --with-devlibdir to only switch libdpkg-dev to a multiarch dir
The perl plugins and dselect methods need to use the non-multiarch
directory, or things break. We can use now the new option to only
install the C libdpkg files in a multiarch enabled path.
The fix from commit 3ce3a7adeb8c815734a35b95aee96bacd1aafde4 was not
correct, as libdpkg.pc was not moved to the multiarch directory and
was making the build fail, because it needs to have a libdir matching
the directory where the library was installed.
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rwxr-xr-x | debian/rules | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 422bbea39..59e37b609 100644 --- a/debian/changelog +++ b/debian/changelog @@ -35,9 +35,8 @@ dpkg (1.18.3) UNRELEASED; urgency=low - Add a new --with-devlibdir configure option for the C libdpkg library. * Packaging: - Remove unneeded --sourcedir options from dh_install calls. - - Do not change libdir to a multi-arch directory for the entire dpkg. - This changes too many directories that are expected to be non-multiarch - aware. Closes: #794977 + - Use the new --with-devlibdir configure option to only switch libdpkg-dev + files to the multi-arch directory. Closes: #794977 * Documentation: - Fix typos for --predep-package option name. Closes: #794688 diff --git a/debian/rules b/debian/rules index 0c535a9b5..6a54c6cf0 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,6 @@ ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS))) endif D := $(CURDIR)/debian/tmp -D_MA := $(D)/usr/lib/$(DEB_HOST_MULTIARCH) # Create configure script if necessary, automake handles rebuilding it. configure: @@ -59,6 +58,7 @@ build-tree/config.status: configure --sysconfdir=/etc \ --sbindir=/sbin \ --localstatedir=/var \ + --with-devlibdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-zlib \ --with-liblzma \ --with-bz2 @@ -86,11 +86,6 @@ install: check cd build-tree && $(MAKE) DESTDIR=$(D) install - # Passing --libdir to configure has too many side effects, install - # the paths into Multi-Arch directories here instead. - mkdir -p $(D_MA) - mv $(D)/usr/lib/libdpkg.a $(D_MA) - ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes)) # Ubuntu's «i386» architecture is built for i686 (the Debian default # is i586). |