From d9790286eb25f6b0f09af506b7c1f4c67b67abde Mon Sep 17 00:00:00 2001
From: Markham <markham001@gmx.de>
Date: Sat, 29 Jun 2024 10:31:59 +0200
Subject: [PATCH] fix python3; fix enviroment-build

---
 make/environment-build.mk | 12 ++++++------
 make/python3.mk           | 14 +++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 90777af..0fe8c3e 100755
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -110,28 +110,28 @@ else ifeq ($(BOXSERIES), hd2)
   TARGET                 = arm-cortex-linux-uclibcgnueabi
   TARGET_O_CFLAGS        = -O2 -flto
   TARGET_ARCH            = arm
-  TARGET_CPU             = cortex-a9
-  TARGET_ABI             = -mcpu=$(TARGET_CPU) -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
+  TARGET_CPU             = armv7-a
+  TARGET_ABI             = -march=$(TARGET_CPU) -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard -mlittle-endian
   TARGET_ENDIAN          = little
   TARGET_EXTRA_CFLAGS    =
   TARGET_EXTRA_LDFLAGS   = -flto
   ifeq ($(BOXMODEL),kronos_v2)
-    TARGET_O_CFLAGS      = -Os
+    TARGET_O_CFLAGS      = -Os -flto
     TARGET_EXTRA_CFLAGS  = -fdata-sections -ffunction-sections
     TARGET_EXTRA_LDFLAGS = -flto -Wl,--gc-sections
   endif
   CXX11_ABI              = -D_GLIBCXX_USE_CXX11_ABI=0
 
 else ifeq ($(BOXSERIES),$(filter $(BOXSERIES), hd5x hd6x))
-  CORTEX-STRINGS         =
+  CORTEX-STRINGS         = -lcortex-strings
   TARGET                 = arm-cortex-linux-gnueabihf
-  TARGET_O_CFLAGS        = -O2
+  TARGET_O_CFLAGS        = -O2 -flto
   TARGET_ARCH            = arm
   TARGET_CPU             = armv7ve
   TARGET_ABI             = -march=$(TARGET_CPU) -mtune=cortex-a15 -mfpu=neon-vfpv4 -mfloat-abi=hard
   TARGET_ENDIAN          = little
   TARGET_EXTRA_CFLAGS    =
-  TARGET_EXTRA_LDFLAGS   =
+  TARGET_EXTRA_LDFLAGS   = -flto
   CXX11_ABI              =
 
 else
diff --git a/make/python3.mk b/make/python3.mk
index fb964c1..ce5ec32 100644
--- a/make/python3.mk
+++ b/make/python3.mk
@@ -7,12 +7,14 @@ PYTHON3_CONF_ENV = \
 	ac_cv_working_tzset=yes
 	
 # GCC is always compliant with IEEE754
-ifeq ($(TARGET_ENDIAN), "little")
+ifeq ($(TARGET_ENDIAN), little)
 PYTHON3_CONF_ENV += \
-	ac_cv_little_endian_double=yes
+	ac_cv_little_endian_double=yes \
+	ax_cv_c_float_words_bigendian=no
 else
 PYTHON3_CONF_ENV += \
 	ac_cv_big_endian_double=yes
+	ax_cv_c_float_words_bigendian=yes
 endif
 
 # uClibc is known to have a broken wcsftime() implementation, so tell
@@ -131,7 +133,7 @@ VENV_DIR = $(BUILD_TMP)/python3_venv
 
 CFLAGS="-I$(TARGETPREFIX)/usr/include/python$(PYTHON3_VER_MAJOR)"
 
-PACKAGES_DEPS =  $(D)/host_python3_pip $(D)/host_python3_crossenv $(D)/python3_build_crossenv $(D)/python3_upgrade_pip $(D)/python3_packages
+PACKAGES_DEPS =  $(D)/host_python3_pip $(D)/host_python3_crossenv $(D)/python3_build_crossenv $(D)/python3_upgrade_venv_tools $(D)/python3_packages
 
 $(D)/yt-dlp: $(D)/python3_packages | $(TARGETPEFIX)
 	$(START_BUILD)
@@ -170,9 +172,11 @@ $(D)/python3_build_crossenv: $(D)/host_python3 $(D)/host_python3_crossenv | $(TA
 	$(VENV_DIR)/bin/activate
 	$(TOUCH)
 	
-$(D)/python3_upgrade_pip: $(D)/python3 | $(TARGETPEFIX)
+$(D)/python3_upgrade_venv_tools: $(D)/python3 | $(TARGETPEFIX)
 	$(START_BUILD)
-	$(VENV_DIR)/bin/cross-python3 -m pip -v install pip --upgrade
+	@echo "Upgrade python crossenv tools."
+	$(VENV_DIR)/bin/cross-pip -v install --upgrade pip
+	$(VENV_DIR)/bin/build-pip -v install --upgrade pip setuptools wheel
 	$(TOUCH)
 
 $(D)/host_python3_crossenv: $(D)/host_python3 $(D)/host_python3_pip $(D)/python3  | $(TARGETPEFIX)
-- 
2.39.5