Merge Mainline

package/libs/libselinux/Makefile

@@ -17,6 +17,7 @@ HOST_BUILD_DEPENDS:=libsepol/host pcre/host
 PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 define Package/libselinux
   SECTION:=libs
@@ -36,7 +37,6 @@ define Package/libselinux/description
 	older version supported by the kernel) when loading policy.
 endef
 
-include $(INCLUDE_DIR)/host-build.mk
 
 # Needed to link libselinux utilities, which link against
 # libselinux.so, which indirectly depends on libpcre.so, installed in

package/libs/libsepol/Makefile

@@ -16,6 +16,7 @@ PKG_HASH:=ae6778d01443fdd38cd30eeee846494e19f4d407b09872580372f4aa4bf8a3cc
 PKG_MAINTAINER:=Thomas Petazzoni <thomas.petazzoni@bootlin.com>
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
 
 define Package/libsepol
   SECTION:=libs
@@ -27,9 +28,7 @@ endef
 define Package/libsepol/description
 	Libsepol is the binary policy manipulation library. It doesn't
 	depend upon or use any of the other SELinux components.
-endef #'
-
-include $(INCLUDE_DIR)/host-build.mk
+endef
 
 HOST_MAKE_FLAGS += \
 	PREFIX=$(STAGING_DIR_HOSTPKG) \

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,6 +62,14 @@ define Package/libpcrecpp
   DEPENDS:=+libpcre $(CXX_DEPENDS)
 endef
 
+
+HOST_CONFIGURE_ARGS += \
+	--enable-utf8 \
+	--enable-unicode-properties \
+	--enable-pcre16 \
+	--with-match-limit-recursion=16000 \
+	--enable-cpp
+
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \
@@ -117,3 +126,4 @@ $(eval $(call BuildPackage,libpcre))
 $(eval $(call BuildPackage,libpcre16))
 $(eval $(call BuildPackage,libpcre32))
 $(eval $(call BuildPackage,libpcrecpp))
+$(eval $(call HostBuild))

target/linux/x86/generic/config-4.14

@@ -104,6 +104,7 @@ CONFIG_EFIVAR_FS=m
 # CONFIG_EFI_BOOTLOADER_CONTROL is not set
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_CAPSULE_QUIRK_QUARK_CSH is not set
+# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
 # CONFIG_EFI_DEV_PATH_PARSER is not set
 CONFIG_EFI_ESRT=y
 # CONFIG_EFI_FAKE_MEMMAP is not set