[openwrt/openwrt] pcre: clean up Makefile line order

LEDE Commits lede-commits at lists.infradead.org
Thu Aug 13 21:44:01 EDT 2020


dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/4469e45f60842c8bc601b4c5b68b10d6aa74334d

commit 4469e45f60842c8bc601b4c5b68b10d6aa74334d
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Fri Aug 14 02:38:21 2020 +0100

    pcre: clean up Makefile line order
    
    The most recent patch added add lines in one block instead of in the
    appropriate places to keep Makefiles in consistent style. Fix that.
    
    Fixes: ff02e1561f ("pcre: add host variant of libpcre")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 package/libs/pcre/Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/package/libs/pcre/Makefile b/package/libs/pcre/Makefile
index 3655614169..bf3f733a5c 100644
--- a/package/libs/pcre/Makefile
+++ b/package/libs/pcre/Makefile
@@ -29,6 +29,7 @@ PKG_CONFIG_DEPENDS:=\
 
 include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 define Package/libpcre/default
   SECTION:=libs
@@ -61,7 +62,6 @@ define Package/libpcrecpp
   DEPENDS:=+libpcre $(CXX_DEPENDS)
 endef
 
-include $(INCLUDE_DIR)/host-build.mk
 
 HOST_CONFIGURE_ARGS += \
 	--enable-utf8 \
@@ -70,9 +70,6 @@ HOST_CONFIGURE_ARGS += \
 	--with-match-limit-recursion=16000 \
 	--enable-cpp
 
-$(eval $(call HostBuild))
-
-
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
@@ -129,3 +126,4 @@ $(eval $(call BuildPackage,libpcre))
 $(eval $(call BuildPackage,libpcre16))
 $(eval $(call BuildPackage,libpcre32))
 $(eval $(call BuildPackage,libpcrecpp))
+$(eval $(call HostBuild))



More information about the lede-commits mailing list