[Pkg-bitcoin-commits] [libbitcoin] 02/03: Tighten build-dependency on d-shlibs to versions supporting both multiarch and skipping .la files, and simplify rules file.

Jonas Smedegaard dr at jones.dk
Fri Aug 15 12:32:08 UTC 2014


This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libbitcoin.

commit cf2814213f10de5e0d7e4bae5c6884f9a48c132c
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Aug 15 13:47:22 2014 +0200

    Tighten build-dependency on d-shlibs to versions supporting both multiarch and skipping .la files, and simplify rules file.
---
 debian/rules | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/debian/rules b/debian/rules
index b69ab7d..91bc271 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ deps = $(patsubst %,$(comma) lib%-dev,$(dev-deps))
 deps +=, pkg-config
 
 # Needed for our packaging
-deps-pkg +=, autoconf-archive, d-shlibs (>= 0.48)
+deps-pkg +=, autoconf-archive, d-shlibs (>= 0.50)
 
 CDBS_BUILD_DEPENDS +=, $(deps), $(deps-pkg)
 
@@ -84,22 +84,14 @@ DEB_MAKE_CHECK_TARGET = check
 
 DEB_INSTALL_EXAMPLES_$(devpkg) = examples/*
 
-# avoid unneeded .la file
-binary-post-install/$(libpkg):: debian/stamp-local-strip-la
-debian/stamp-local-strip-la: binary-install/$(libpkg)
-	find debian -type f -name '*.la' -delete
-	touch $@
-clean::
-	rm -f debian/stamp-local-strip-la
-
 # Let d-shlibs calculate development package dependencies
 #  and handle shared library install
+#  * d-shlibs 0.50 required for --multiarch and --exclude-la options
 binary-post-install/$(libpkg) binary-post-install/$(devpkg):: \
  debian/stamp-local-shlibs-$(lib)
 debian/stamp-local-shlibs-$(lib): \
  binary-install/$(libpkg) \
- binary-install/$(devpkg) \
- debian/stamp-local-strip-la
+ binary-install/$(devpkg)
 	d-shlibmove --commit \
 		--devunversioned \
 		--exclude-la \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libbitcoin.git



More information about the Pkg-bitcoin-commits mailing list