binutils-*-*-*: Use oh-shlibdeps

4 files changed, 7 insertions, 2 deletions

diff --git a/binutils.pkg.in/control b/binutils.pkg.in/control
index 368d0e5..2b9d7d4 100644
--- a/binutils.pkg.in/control
+++ b/binutils.pkg.in/control
@@ -1,6 +1,6 @@
 Architecture: i686-any-any amd64-any-any @PKG_TARGET_ARCH@
 Platform: all
-Depends: binutils-common (= ${Binary-Version}), libz.1
+Depends: binutils-common (= ${Binary-Version}), ${Shlib-Depends}
 Description: GNU binary utilities for @PKG_TARGET_ARCH@
  This package provides the GNU assembler, linker, and various other utilities
  for manipulating binary files.  These utilities are commonly used with a
diff --git a/build b/build
index 6fccea6..b2ee83d 100755
--- a/build
+++ b/build
@@ -196,6 +196,7 @@ install: build
 		oh-strip -d "binutils-$${target}.data" || \
 		exit 1; \
 	done
+	oh-shlibdeps
 
 clean: clean-build clean-install
 
diff --git a/changelog b/changelog
index e7961cd..78cc5e3 100644
--- a/changelog
+++ b/changelog
@@ -8,6 +8,7 @@ binutils (2.32+sip1-1) trunk
     removed upstream).
   * Remove embedded copy of zlib (contains non-free IETC RFCs and isn't
     needed anyway).
+  * binutils-*-*-*: Use automatic shared library dependencies.
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Tue, 30 Apr 2019 15:10:59 -0400
 
diff --git a/control b/control
index b3703e4..f13c7fb 100644
--- a/control
+++ b/control
@@ -1,3 +1,6 @@
 Maintainer: Patrick McDermott <patrick.mcdermott@libiquity.com>
-Build-Depends: opkbuild (>= 4.0.0), gpg, dirmngr, libz.1-dev, opkhelper-3.0, gettext, dejagnu
+Build-Depends:
+ gpg, dirmngr,
+ opkbuild (>= 4.0.1), opkhelper-3.0 (>= 3.1.2),
+ gettext, dejagnu
 Homepage: https://www.gnu.org/software/binutils/