[openwrt/openwrt] pcre: fix paths in config file

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 22 13:13:06 EST 2020


ynezz pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/6e5759f6b4852515a6092a43a767a0f5e09a6cb7

commit 6e5759f6b4852515a6092a43a767a0f5e09a6cb7
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Thu Dec 10 01:56:28 2020 -0800

    pcre: fix paths in config file
    
    The paths are pointing to OS paths, not OpenWrt ones. Use SED line from
    libpng to fix and adjust accordingly.
    
    This may allow certain packages that use the config file to pick up pcre.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 package/libs/pcre/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile
index bf3f733a5c..37d939da7f 100644
--- a/package/libs/pcre/Makefile
+++ b/package/libs/pcre/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pcre
 PKG_VERSION:=8.44
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
@@ -87,6 +87,7 @@ MAKE_FLAGS += \
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pcre-config $(1)/usr/bin/
+	$(SED) 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' $(1)/usr/bin/pcre-config
 
 	$(INSTALL_DIR) $(2)/bin
 	$(LN) $(STAGING_DIR)/usr/bin/pcre-config $(2)/bin



More information about the lede-commits mailing list