Reinhard Russinger 4 жил өмнө
parent
commit
b2007367cf

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-820
+824

+ 1 - 1
configs/Display001_4.4.104-bone-rt-21_Qt5.15.2_defconfig

@@ -10,7 +10,7 @@ BR2_BINUTILS_VERSION_2_32_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
-BR2_PACKAGE_HOST_GDB_PYTHON3=y
+BR2_PACKAGE_HOST_GDB_PYTHON=y
 BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
 BR2_TARGET_OPTIMIZATION="-pipe"
 BR2_TARGET_GENERIC_HOSTNAME="GfA"

+ 17 - 0
patches/0115-qt5webengine-revert-parallel-build-to-all-cpu.patch

@@ -0,0 +1,17 @@
+diff --git a/package/qt5/qt5webengine/qt5webengine.mk b/package/qt5/qt5webengine/qt5webengine.mk
+index 786c1b3c9a..fca0d7104f 100644
+--- a/package/qt5/qt5webengine/qt5webengine.mk
++++ b/package/qt5/qt5webengine/qt5webengine.mk
+@@ -60,11 +60,7 @@ define QT5WEBENGINE_PYTHON2_SYMLINK
+ endef
+ QT5WEBENGINE_PRE_CONFIGURE_HOOKS += QT5WEBENGINE_PYTHON2_SYMLINK
+ 
+-##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
+-QT5WEBENGINE_ENV += NINJAFLAGS="-j3"
+-
+-##P_JOBS=$(shell echo $(PARALLEL_JOBS)/2) | bc)
+-##QT5WEBENGINE_ENV += NINJAFLAGS="-j$(P_JOBS)"
++QT5WEBENGINE_ENV += NINJAFLAGS="-j$(PARALLEL_JOBS)"
+ 
+ define QT5WEBENGINE_CREATE_HOST_PKG_CONFIG
+ 	sed s%@HOST_DIR@%$(HOST_DIR)%g $(QT5WEBENGINE_PKGDIR)/host-pkg-config.in > $(@D)/host-bin/host-pkg-config