From e0b250538eae7f4192dea85a38352981bde6c02a Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Mon, 27 May 2019 10:12:39 -0300 Subject: [PATCH 1/2] oniguruma: change ${...} to $(...) in Makefile Signed-off-by: Eneas U de Queiroz --- libs/oniguruma/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/oniguruma/Makefile b/libs/oniguruma/Makefile index 33f0e598f..62ba644b8 100644 --- a/libs/oniguruma/Makefile +++ b/libs/oniguruma/Makefile @@ -48,7 +48,7 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/{include,lib} $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ - $(SED) 's,/usr,${STAGING_DIR}/usr,g' $(1)/usr/lib/pkgconfig/oniguruma.pc + $(SED) 's,/usr,$(STAGING_DIR)/usr,g' $(1)/usr/lib/pkgconfig/oniguruma.pc endef $(eval $(call BuildPackage,oniguruma)) From 3ab4804d10b88aaa6099ae51d14b5ff0b3ab5e6b Mon Sep 17 00:00:00 2001 From: Eneas U de Queiroz Date: Mon, 27 May 2019 10:14:05 -0300 Subject: [PATCH 2/2] libevhtp: pass TARGET_CPPFLAGS to cmake Added $(TARGET_CPPFLAGS) to TARGET_CFLAGS to fix a buildbot failure to find oniguruma include files. Signed-off-by: Eneas U de Queiroz --- libs/libevhtp/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/libevhtp/Makefile b/libs/libevhtp/Makefile index 6e2313aab..07668fd8b 100644 --- a/libs/libevhtp/Makefile +++ b/libs/libevhtp/Makefile @@ -25,6 +25,7 @@ PKG_MAINTAINER:=Eneas U de Queiroz PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE +TARGET_CFLAGS += $(TARGET_CPPFLAGS) CMAKE_INSTALL:=1 CMAKE_OPTIONS += \ -DLIB_INSTALL_DIR="$(STAGING_DIR)/usr/lib" \