summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2025-03-24 04:28:55 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2025-03-24 04:35:58 +0100
commit2a52816a8883f8bb6d95b3ee8f3be9ddde0a71a4 (patch)
tree0de8c890784785ab430e011e9af3a8c4994eb1e1
parentd2537267bbf29e1acae833b5da7831f628b5146c (diff)
fix build when SSL headers are not installed on the build host
-rw-r--r--mk/kernel-vars.mk2
-rw-r--r--package/u-boot/Makefile6
-rw-r--r--target/config/Config.in.tools4
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 475353d6f..ccb090d9d 100644
--- a/mk/kernel-vars.mk
+++ b/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),)
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index bf97764b2..8424e2cb9 100644
--- a/package/u-boot/Makefile
+++ b/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 \
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index cdeeb90ed..d60b42a08 100644
--- a/target/config/Config.in.tools
+++ b/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