Browse Source

fix build when SSL headers are not installed on the build host

Waldemar Brodkorb 7 months ago
parent
commit
2a52816a88
3 changed files with 7 additions and 5 deletions
  1. 1 1
      mk/kernel-vars.mk
  2. 4 2
      package/u-boot/Makefile
  3. 2 2
      target/config/Config.in.tools

+ 1 - 1
mk/kernel-vars.mk

@@ -27,7 +27,7 @@ ifneq ($(OS_FOR_BUILD),Linux)
 KERNEL_MAKE_OPTS+=	HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}'
 KERNEL_MAKE_OPTS+=	HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/usr/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -I${LINUX_DIR}/scripts/dtc/libfdt -DKBUILD_NO_NLS'
 else
-KERNEL_MAKE_OPTS+=	HOSTCFLAGS='${HOST_CFLAGS}'
+KERNEL_MAKE_OPTS+=	HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)'
 endif
 
 ifneq ($(ADK_TARGET_KERNEL_LOADADDR),)

+ 4 - 2
package/u-boot/Makefile

@@ -91,6 +91,8 @@ CONFIG:=		starfive_visionfive2_defconfig
 UBOOT:=			u-boot.itb
 endif
 
+MAKE_FLAGS+=		HOSTCFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \
+			HOSTLDFLAGS="$(HOST_LDFLAGS)"
 HOST_MAKE_FLAGS+=	HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
 			HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
 HOST_STYLE:=		manual
@@ -104,9 +106,9 @@ endif
 
 host-build:
 	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
-		$(HOST_MAKE_FLAGS) sandbox_defconfig )
+		$(HOST_MAKE_FLAGS) tools-only_defconfig )
 	(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
-		$(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
+		$(HOST_MAKE_FLAGS) tools-only $(MAKE_TRACE) )
 
 u-boot-hostinstall:
 	$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \

+ 2 - 2
target/config/Config.in.tools

@@ -39,9 +39,9 @@ config ADK_HOST_BUILD_LIBTOOL
 	bool
 	default y
 
-config ADK_HOST_BUILD_LIBRESSL
+config ADK_HOST_BUILD_OPENSSL
 	bool
-	default n
+	default y
 
 config ADK_HOST_BUILD_PKGCONF
 	bool