Browse Source

apr: install apr-1-config to host

Helps old packages that don't use pkgconfig.

Fix some extra paths.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
lilik-openwrt-22.03
Rosen Penev 4 years ago
parent
commit
367eab02d9
No known key found for this signature in database GPG Key ID: 36D31CFA845F0E3B
1 changed files with 5 additions and 1 deletions
  1. +5
    -1
      libs/apr/Makefile

+ 5
- 1
libs/apr/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=apr PKG_NAME:=apr
PKG_VERSION:=1.7.0 PKG_VERSION:=1.7.0
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=@APACHE/apr/ 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 $(CP) $(PKG_INSTALL_DIR)/usr/share/build-1/* $(1)/usr/share/build-1
$(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \ $(SED) '/^prefix=\|^exec_prefix=/s|/usr|$(STAGING_DIR)/usr|' \
$(1)/usr/bin/apr-1-config $(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) '/^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' \ $(SED) 's,/usr/share/build-1,$(STAGING_DIR)/usr/share/build-1,g' \
$(1)/usr/share/build-1/apr_rules.mk $(1)/usr/share/build-1/apr_rules.mk
$(INSTALL_DIR) $(2)/bin
$(LN) ../../usr/bin/apr-1-config $(2)/bin/apr-1-config
endef endef
define Package/libapr/install define Package/libapr/install


Loading…
Cancel
Save