From: Sebastian Kemper <redacted>
Date: Thu, 30 Jan 2020 20:53:07 +0000 (+0100)
Subject: apr-util: clean up InstallDev
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a16b29480567d89dedc5775d03391e3203d4e644;p=openwrt-packages.git

apr-util: clean up InstallDev

This removes the ifneq in InstallDev, because the maintainers are likely
to forget to extend it when new plugins are added (this has already
occurred).

Also, this removes the la files, because OpenWrt won't allow them into
staging anyway.

No rev bump because meaningless for the apr-util packages.

Signed-off-by: Sebastian Kemper <redacted>
---

diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile
index 2b4f25b55..bd9ba1c98 100644
--- a/libs/apr-util/Makefile
+++ b/libs/apr-util/Makefile
@@ -131,12 +131,10 @@ define Build/InstallDev
 				$(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/apu-1-config $(1)/usr/bin
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/apr-1/* $(1)/usr/include/apr-1
-ifneq ($(CONFIG_PACKAGE_libaprutil-crypto-openssl)$(CONFIG_PACKAGE_libaprutil-dbd-pgsql)$(CONFIG_PACKAGE_libaprutil-dbd-sqlite3)$(CONFIG_PACKAGE_libaprutil-ldap),)
 	$(INSTALL_DIR) $(1)/usr/lib/apr-util-1
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*{la,a,so*} \
-					$(1)/usr/lib/apr-util-1
-endif
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/apr-util-1/apr_*.{a,so} \
+			$(1)/usr/lib/apr-util-1 2>/dev/null || :
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{a,so*} \
 						$(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \
 					$(1)/usr/lib/pkgconfig