From b19cbe14d8fb63ece754afda579cb4b44587cfb2 Mon Sep 17 00:00:00 2001 From: Markham Date: Thu, 7 Mar 2024 20:07:06 +0100 Subject: [PATCH] fix target host_libffi --- make/libraries.mk | 9 ++++----- make/python3.mk | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/make/libraries.mk b/make/libraries.mk index 77380d5..22647a1 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -1305,9 +1305,9 @@ $(D)/libfribidi: $(ARCHIVE)/fribidi-$(FRIBIDI_VER).tar.xz | $(TARGETPREFIX) # # libffi # -LIBFFI_CONF = +LIBFFI_CONF_OPTS = ifeq ($(BOXSERIES), hd1) - LIBFFI_CONF = --enable-static --disable-shared + LIBFFI_CONF_OPTS = --enable-static --disable-shared endif $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz $(START_BUILD) @@ -1324,7 +1324,7 @@ $(D)/libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz --mandir=/.remove \ --infodir=/.remove \ --datarootdir=/.remove \ - $(LIBFFI_CONF) \ + $(LIBFFI_CONF_OPTS) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(TARGETPREFIX) @@ -1342,12 +1342,11 @@ $(D)/host_libffi: $(ARCHIVE)/libffi-$(LIBFFI_VER).tar.gz echo -e "==> $(TERM_RED)Applying Patch:$(TERM_NORMAL) $$i"; \ patch -p1 < $$i; \ done; \ - ./configure \ + ./configure $($HOST_CFLAGS) \ --prefix=/usr \ --mandir=/.remove \ --infodir=/.remove \ --datarootdir=/.remove \ - $(LIBFFI_CONF) \ ; \ $(MAKE); \ $(MAKE) install DESTDIR=$(HOSTPREFIX) diff --git a/make/python3.mk b/make/python3.mk index 4fd81a0..3ee37a0 100644 --- a/make/python3.mk +++ b/make/python3.mk @@ -175,7 +175,7 @@ $(D)/python3_upgrade_pip: $(D)/python3 | $(TARGETPEFIX) $(VENV_DIR)/bin/cross-python3 -m pip -v install pip --upgrade $(TOUCH) -$(D)/host_python3_crossenv: $(D)/host_python3 $(D)/host_python3_pip | $(TARGETPEFIX) +$(D)/host_python3_crossenv: $(D)/host_python3 $(D)/host_python3_pip $(D)/python3 | $(TARGETPEFIX) $(START_BUILD) @echo "Installing python crossenv." $(HOSTPREFIX)/usr/bin/pip install crossenv -- 2.39.5