diff options
| author | Sebastian Kemper <sebastian_ml@gmx.net> | 2020-01-26 18:59:42 +0100 |
|---|---|---|
| committer | Sebastian Kemper <sebastian_ml@gmx.net> | 2020-01-26 19:00:48 +0100 |
| commit | a62c0e599b52307e0896e15164ae1558a81be930 (patch) | |
| tree | 203d2275b4d90b9a4a4973d5a0bae86299c1f6ad /libs/apr-util/Makefile | |
| parent | 193c3913b6a1c8d273cb86e2598848fc8b3920b6 (diff) | |
apr-util: clean up Makefile and remove patch
- removes 001-automake-compat.patch:
Looks like this was meant as a workaround for a libtool issue. But it
doesn't appear to be needed anymore.
- cleans up installation defines (uses macros, cleans up sed scripts,
removes gratuitous slashes & whitespaces)
Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
Diffstat (limited to 'libs/apr-util/Makefile')
| -rw-r--r-- | libs/apr-util/Makefile | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/libs/apr-util/Makefile b/libs/apr-util/Makefile index d0efff1a4..2b4f25b55 100644 --- a/libs/apr-util/Makefile +++ b/libs/apr-util/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apr-util PKG_VERSION:=1.6.1 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@APACHE/apr/ @@ -127,30 +127,26 @@ $$(eval $$(call BuildPackage,libaprutil-$(subst _,-,$(1)))) endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1/ $(1)/usr/lib $(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/ + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/include/apr-1 \ + $(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 + $(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*} \ - $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ - $(1)/usr/lib/pkgconfig/ - $(SED) 's, -e \"s -I$$$$prefix/lib g\",,g' $(1)/usr/bin/apu-1-config - $(SED) 's,^libdir=\"$$$${exec_prefix}/lib,libdir=\"$(STAGING_DIR)/usr/lib,g' $(1)/usr/bin/apu-1-config - $(SED) 's,^includedir=\"$$$${prefix}/include/,includedir=\"$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/apu-1-config - $(SED) 's,-L$$$$libdir,,g' $(1)/usr/bin/apu-1-config - $(SED) 's,-R$$$$libdir,,g' $(1)/usr/bin/apu-1-config + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.{la,a,so*} \ + $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apr-util-1.pc \ + $(1)/usr/lib/pkgconfig + $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ + $(1)/usr/bin/apu-1-config endef define Package/libaprutil/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libaprutil-1.so.* $(1)/usr/lib endef $(eval $(call BuildPackage,libaprutil)) |