Index: 5.15.8/Makefile
===================================================================
--- 5.15.8/Makefile (revision 384)
+++ 5.15.8/Makefile (revision 385)
@@ -9,7 +9,12 @@
COMPONENT_TARGETS += $(HARDWARE_NANOPI_NEO)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PP)
COMPONENT_TARGETS += $(HARDWARE_ORANGE_PL2)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5B)
+COMPONENT_TARGETS += $(HARDWARE_ORANGE_PI5P)
+COMPONENT_TARGETS += $(HARDWARE_ROCK_5B)
COMPONENT_TARGETS += $(HARDWARE_WECHIP_TX6)
+COMPONENT_TARGETS += $(HARDWARE_REPKA_PI3)
COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
COMPONENT_TARGETS += $(HARDWARE_POIN2)
COMPONENT_TARGETS += $(HARDWARE_RK3328_CC)
@@ -42,6 +47,7 @@
COMPONENT_TARGETS += $(HARDWARE_TL2SV2)
COMPONENT_TARGETS += $(HARDWARE_TL2WK2_LSB)
COMPONENT_TARGETS += $(HARDWARE_TL2SV2_LSB)
+COMPONENT_TARGETS += $(HARDWARE_VISIONFIVE2)
COMPONENT_TARGETS += $(HARDWARE_SIFIVE_U740)
@@ -182,7 +188,8 @@
ABI = gnueabihf
endif
ifneq ($(filter $(TOOLCHAIN),$(TOOLCHAIN_H5_GLIBC) $(TOOLCHAIN_RK33XX_GLIBC) \
- $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_S9XX_GLIBC) \
+ $(TOOLCHAIN_RK339X_GLIBC) $(TOOLCHAIN_RK358X_GLIBC) \
+ $(TOOLCHAIN_S9XX_GLIBC) \
$(TOOLCHAIN_A311X_GLIBC) $(TOOLCHAIN_M1000_GLIBC)),)
ARCH = aarch64
ABI = gnu
@@ -374,6 +381,10 @@
endif
+q-collection-generator = $(shell which qcollectiongenerator)
+q-help-generator = $(shell which qhelpgenerator)
+
+
TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
@@ -839,6 +850,53 @@
> $(QT5_PKG)/usr/share/doc/$(doc_dir_name)/config.summary
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(QT5_PKG))
+ # ======= Install qt.conf file =======
+ @mkdir -p $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin
+ @echo "" > $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "[EffectivePaths]" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Prefix=/usr" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Headers=/usr/include/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Binaries=/usr/lib$(LIBSUFFIX)/qt5/bin" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostBinaries=/usr/lib$(LIBSUFFIX)/qt5/bin" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Libraries=/usr/lib$(LIBSUFFIX)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostLibraries=/usr/lib$(LIBSUFFIX)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "LibraryExecutables=/usr/lib$(LIBSUFFIX)/qt5/libexec" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "ArchData=/usr/lib$(LIBSUFFIX)/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Data=/usr/share/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostData=/usr/lib$(LIBSUFFIX)/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Plugins=/usr/lib$(LIBSUFFIX)/qt5/plugins" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Imports=/usr/lib$(LIBSUFFIX)/qt5/imports" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Qml2Imports=/usr/lib$(LIBSUFFIX)/qt5/qml" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Settings=/etc/xdg" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Examples=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Demos=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Tests=/usr/tests" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Translations=/usr/share/qt5/translations" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Documentation=/usr/share/doc/$(doc_dir_name)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "[Paths]" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Prefix=/usr" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Headers=/usr/include/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Binaries=/usr/lib$(LIBSUFFIX)/qt5/bin" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostBinaries=/usr/lib$(LIBSUFFIX)/qt5/bin" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Libraries=/usr/lib$(LIBSUFFIX)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostLibraries=/usr/lib$(LIBSUFFIX)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "LibraryExecutables=/usr/lib$(LIBSUFFIX)/qt5/libexec" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "ArchData=/usr/lib$(LIBSUFFIX)/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Data=/usr/share/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostData=/usr/lib$(LIBSUFFIX)/qt5" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Plugins=/usr/lib$(LIBSUFFIX)/qt5/plugins" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Imports=/usr/lib$(LIBSUFFIX)/qt5/imports" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Qml2Imports=/usr/lib$(LIBSUFFIX)/qt5/qml" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Settings=/etc/xdg" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Examples=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Demos=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Tests=/usr/tests" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Translations=/usr/share/qt5/translations" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "Documentation=/usr/share/doc/$(doc_dir_name)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "HostSpec=$(TARGET_SPEC_DIR)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "TargetSpec=devices/$(DEVICE_SPEC_DIR)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
+ @echo "#TargetSpec=$(TARGET_SPEC_DIR)" >> $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/qt.conf
# ======= Remove build-machine tools from target package =======
@rm -f $(QT5_PKG)/usr/bin/$(TARGET)-*
@rm -f $(QT5_PKG)/usr/lib$(LIBSUFFIX)/qt5/bin/$(TARGET)-*
@@ -852,6 +910,19 @@
find . -type f -name 'Qt5*.pc' -exec sed -i 's,$(TARGET_DEST_DIR),,g' {} \; ; \
find . -type f -name 'Qt5*.pc' -exec sed -i 's,/usr,$(TARGET_DEST_DIR)/usr,g' {} \; ; \
)
+ # ======= Tune cmake files for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/cmake ; \
+ for file in `find . -type f -name '*.cmake' -print` ; do \
+ if grep -q 'lib$(LIBSUFFIX)/qt5/bin/' $${file} ; then \
+ sed -i 's,lib$(LIBSUFFIX)/qt5/bin/,lib$(LIBSUFFIX)/qt5/bin/$(TARGET)-,g' $${file} ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Use build-machine qcollectiongenerator, qhelpgenerator =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/cmake/Qt5Help ; \
+ sed -i '/-qcollectiongenerator"/s,".*","$(q-collection-generator)",' Qt5HelpConfigExtras.cmake ; \
+ sed -i '/-qhelpgenerator"/s,".*","$(q-help-generator)",' Qt5HelpConfigExtras.cmake ; \
+ )
# ======= Strip binaries =======
@( cd $(QT5_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
Index: 5.15.8/PATCHES
===================================================================
--- 5.15.8/PATCHES (revision 384)
+++ 5.15.8/PATCHES (revision 385)
@@ -2,6 +2,7 @@
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-sql-config.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-mysql.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.15.8-icu-permissive.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-mips32r5.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-arm-no-thumb.patch -p0
Index: 5.15.8
===================================================================
--- 5.15.8 (revision 384)
+++ 5.15.8 (revision 385)
Property changes on: 5.15.8
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 5.15.8-ppc32/Makefile
===================================================================
--- 5.15.8-ppc32/Makefile (revision 384)
+++ 5.15.8-ppc32/Makefile (revision 385)
@@ -289,6 +289,10 @@
endif
+q-collection-generator = $(shell which qcollectiongenerator)
+q-help-generator = $(shell which qhelpgenerator)
+
+
TARGET_BIN_RPATH = /lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX)
TARGET_LIB_RPATH = /lib$(MULTILIB_PPC32_SUFFIX):/usr/lib$(MULTILIB_PPC32_SUFFIX):/usr/lib/../lib$(MULTILIB_PPC32_SUFFIX)
@@ -661,6 +665,53 @@
@chmod 0755 $(QT5_32_PKG)/etc/profile.d/32/*
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(QT5_32_PKG))
+ # ======= Install qt.conf file =======
+ @mkdir -p $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin
+ @echo "" > $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "[EffectivePaths]" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Prefix=/usr" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Headers=/usr/include/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Binaries=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostBinaries=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Libraries=/usr/lib$(MULTILIB_PPC32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostLibraries=/usr/lib$(MULTILIB_PPC32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "LibraryExecutables=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/libexec" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "ArchData=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Data=/usr/share/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostData=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Plugins=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/plugins" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Imports=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/imports" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Qml2Imports=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/qml" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Settings=/etc/xdg" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Examples=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Demos=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Tests=/usr/tests" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Translations=/usr/share/qt5/translations" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Documentation=/usr/share/doc/$(doc_dir_name)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "[Paths]" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Prefix=/usr" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Headers=/usr/include/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Binaries=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostBinaries=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Libraries=/usr/lib$(MULTILIB_PPC32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostLibraries=/usr/lib$(MULTILIB_PPC32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "LibraryExecutables=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/libexec" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "ArchData=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Data=/usr/share/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostData=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Plugins=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/plugins" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Imports=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/imports" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Qml2Imports=/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/qml" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Settings=/etc/xdg" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Examples=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Demos=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Tests=/usr/tests" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Translations=/usr/share/qt5/translations" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Documentation=/usr/share/doc/$(doc_dir_name)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "TargetSpec=devices/$(DEVICE_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
+ @echo "#TargetSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/qt.conf
# ======= Remove build-machine tools from target package =======
@rm -f $(QT5_32_PKG)/usr/bin/32/$(TARGET32)-*
@rm -f $(QT5_32_PKG)/usr/lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/$(TARGET32)-*
@@ -674,6 +725,19 @@
find . -type f -name 'Qt5*.pc' -exec sed -i 's,$(TARGET_DEST_DIR),,g' {} \; ; \
find . -type f -name 'Qt5*.pc' -exec sed -i 's,/usr,$(TARGET_DEST_DIR)/usr,g' {} \; ; \
)
+ # ======= Tune cmake files for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/cmake ; \
+ for file in `find . -type f -name '*.cmake' -print` ; do \
+ if grep -q 'lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/' $${file} ; then \
+ sed -i 's,lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/,lib$(MULTILIB_PPC32_SUFFIX)/qt5/bin/$(TARGET32)-,g' $${file} ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Use build-machine qcollectiongenerator, qhelpgenerator =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_PPC32_SUFFIX)/cmake/Qt5Help ; \
+ sed -i '/-qcollectiongenerator"/s,".*","$(q-collection-generator)",' Qt5HelpConfigExtras.cmake ; \
+ sed -i '/-qhelpgenerator"/s,".*","$(q-help-generator)",' Qt5HelpConfigExtras.cmake ; \
+ )
# ======= Strip binaries =======
@( cd $(QT5_32_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
Index: 5.15.8-ppc32/PATCHES
===================================================================
--- 5.15.8-ppc32/PATCHES (revision 384)
+++ 5.15.8-ppc32/PATCHES (revision 385)
@@ -2,6 +2,7 @@
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-sql-config.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-mysql.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.15.8-icu-permissive.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-mips32r5.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-arm-no-thumb.patch -p0
Index: 5.15.8-ppc32
===================================================================
--- 5.15.8-ppc32 (revision 384)
+++ 5.15.8-ppc32 (revision 385)
Property changes on: 5.15.8-ppc32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Index: 5.15.8-x86_32/Makefile
===================================================================
--- 5.15.8-x86_32/Makefile (revision 384)
+++ 5.15.8-x86_32/Makefile (revision 385)
@@ -286,6 +286,10 @@
endif
+q-collection-generator = $(shell which qcollectiongenerator)
+q-help-generator = $(shell which qhelpgenerator)
+
+
TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
@@ -658,6 +662,53 @@
@chmod 0755 $(QT5_32_PKG)/etc/profile.d/32/*
# ======= Install the same to $(TARGET_DEST_DIR) =======
$(call install-into-devenv, $(QT5_32_PKG))
+ # ======= Install qt.conf file =======
+ @mkdir -p $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin
+ @echo "" > $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "[EffectivePaths]" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Prefix=/usr" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Headers=/usr/include/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Binaries=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostBinaries=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Libraries=/usr/lib$(MULTILIB_X86_32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostLibraries=/usr/lib$(MULTILIB_X86_32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "LibraryExecutables=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/libexec" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "ArchData=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Data=/usr/share/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostData=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Plugins=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/plugins" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Imports=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/imports" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Qml2Imports=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/qml" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Settings=/etc/xdg" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Examples=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Demos=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Tests=/usr/tests" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Translations=/usr/share/qt5/translations" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Documentation=/usr/share/doc/$(doc_dir_name)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "[Paths]" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Prefix=/usr" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Headers=/usr/include/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Binaries=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostBinaries=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Libraries=/usr/lib$(MULTILIB_X86_32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostLibraries=/usr/lib$(MULTILIB_X86_32_SUFFIX)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "LibraryExecutables=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/libexec" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "ArchData=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Data=/usr/share/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostData=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Plugins=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/plugins" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Imports=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/imports" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Qml2Imports=/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/qml" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Settings=/etc/xdg" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Examples=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Demos=/usr/share/doc/$(doc_dir_name)/examples" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Tests=/usr/tests" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Translations=/usr/share/qt5/translations" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "Documentation=/usr/share/doc/$(doc_dir_name)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "HostSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "TargetSpec=devices/$(DEVICE_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
+ @echo "#TargetSpec=$(TARGET_SPEC_DIR)" >> $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/qt.conf
# ======= Remove build-machine tools from target package =======
@rm -f $(QT5_32_PKG)/usr/bin/32/$(TARGET32)-*
@rm -f $(QT5_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/$(TARGET32)-*
@@ -671,6 +722,19 @@
find . -type f -name 'Qt5*.pc' -exec sed -i 's,$(TARGET_DEST_DIR),,g' {} \; ; \
find . -type f -name 'Qt5*.pc' -exec sed -i 's,/usr,$(TARGET_DEST_DIR)/usr,g' {} \; ; \
)
+ # ======= Tune cmake files for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/cmake ; \
+ for file in `find . -type f -name '*.cmake' -print` ; do \
+ if grep -q 'lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/' $${file} ; then \
+ sed -i 's,lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/,lib$(MULTILIB_X86_32_SUFFIX)/qt5/bin/$(TARGET32)-,g' $${file} ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Use build-machine qcollectiongenerator, qhelpgenerator =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/cmake/Qt5Help ; \
+ sed -i '/-qcollectiongenerator"/s,".*","$(q-collection-generator)",' Qt5HelpConfigExtras.cmake ; \
+ sed -i '/-qhelpgenerator"/s,".*","$(q-help-generator)",' Qt5HelpConfigExtras.cmake ; \
+ )
# ======= Strip binaries =======
@( cd $(QT5_32_PKG) ; \
find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
Index: 5.15.8-x86_32/PATCHES
===================================================================
--- 5.15.8-x86_32/PATCHES (revision 384)
+++ 5.15.8-x86_32/PATCHES (revision 385)
@@ -2,6 +2,7 @@
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-sql-config.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-mysql.patch -p0
+../../../../sources/packages/x/qt5/patches/qt5-5.15.8-icu-permissive.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-mips32r5.patch -p0
../../../../sources/packages/x/qt5/patches/qt5-5.15.8-arm-no-thumb.patch -p0
Index: 5.15.8-x86_32
===================================================================
--- 5.15.8-x86_32 (revision 384)
+++ 5.15.8-x86_32 (revision 385)
Property changes on: 5.15.8-x86_32
___________________________________________________________________
Modified: svn:ignore
## -30,6 +30,7 ##
.rk328x-glibc
.rk33xx-glibc
.rk339x-glibc
+.rk358x-glibc
.s8xx-glibc
.s9xx-glibc
.x86_64-glibc
Radix cross Linux
The main Radix cross Linux repository contains the build scripts of packages, which have the most complete and common functionality for desktop machines
452 Commits
2 Branches
1 Tag