aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2020-12-07 21:56:32 -0800
committerGitHub <noreply@github.com>2020-12-07 21:56:32 -0800
commit187f84ea869f24c09c59ab6a5daf789a878448ea (patch)
treec6f09194198d627831ffefb5a109655d2a5ac1b8
parent96f499f9b60c76d1ca547a802c22dbb466066e3c (diff)
parent367eab02d9976079e98715fad93c5ca065ee11f2 (diff)
Merge pull request #14172 from neheb/apr
apr: install apr-1-config to host
-rw-r--r--libs/apr/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/apr/Makefile b/libs/apr/Makefile
index 034a4e8f8..f7869d5d8 100644
--- a/libs/apr/Makefile
+++ b/libs/apr/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apr
PKG_VERSION:=1.7.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@APACHE/apr/
@@ -88,9 +88,13 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1
$(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \
$(1)/usr/bin/apr-1-config
+ $(SED) '/^bindir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
$(SED) '/^datadir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
+ $(SED) '/^datarootdir=/s|/usr|$$$${prefix}|' $(1)/usr/bin/apr-1-config
$(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \
$(1)/usr/share/build-1/apr_rules.mk
+ $(INSTALL_DIR) $(2)/bin
+ $(LN) ../../usr/bin/apr-1-config $(2)/bin/apr-1-config
endef
define Package/libapr/install