]> git.webhop.me Git - bs-cst-neutrino-hd.git/commitdiff
fix target host_libffi
authorMarkham <markham001@gmx.de>
Thu, 7 Mar 2024 19:07:06 +0000 (20:07 +0100)
committerMarkham <markham001@gmx.de>
Thu, 7 Mar 2024 19:07:06 +0000 (20:07 +0100)
make/libraries.mk
make/python3.mk

index 77380d55d8c7ecbcb7ad864c1afedcc909ff723a..22647a10ab2a19be4e325b2a1abd1e1fb892ee11 100755 (executable)
@@ -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)
index 4fd81a00af63439235ec19c9e2c0f39f3111cd35..3ee37a0624272312bf270cddc4580cb028f75eaf 100644 (file)
@@ -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