qt6_base: fixes for secondary arch

This commit is contained in:
Gerasim Troeglazov
2021-11-04 22:50:58 +10:00
parent 40122e7d5a
commit 8d243a1944

View File

@@ -8,7 +8,7 @@ COPYRIGHT="2015-2021 The Qt Company Ltd."
LICENSE="GNU LGPL v3
GNU GPL v3
FDL"
REVISION="1"
REVISION="2"
SOURCE_URI="https://download.qt.io/official_releases/qt/${portVersion%.*}/$portVersion/submodules/qtbase-everywhere-src-$portVersion.tar.xz"
CHECKSUM_SHA256="fdfff0716d093bcb6bcd53746ce1d3c9701a6bf3326d47813866d43949b47769"
SOURCE_DIR="qtbase-everywhere-src-$portVersion"
@@ -66,7 +66,7 @@ PROVIDES_devel="
devel:libQt6Concurrent$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6Core$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6DBus$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6DeviceDiscoverySupport = $portVersion compat >= 6
devel:libQt6DeviceDiscoverySupport$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6EdidSupport$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6EglFSDeviceIntegration$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6FBSupport$secondaryArchSuffix = $portVersion compat >= 6
@@ -79,8 +79,8 @@ PROVIDES_devel="
devel:libQt6Test$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6Widgets$secondaryArchSuffix = $portVersion compat >= 6
devel:libQt6Xml$secondaryArchSuffix = $portVersion compat >= 6
cmd:qmake6 = $portVersion compat >= 6
cmd:qtpaths6 = $portVersion compat >= 6
cmd:qmake6$secondaryArchSuffix = $portVersion compat >= 6
cmd:qtpaths6$secondaryArchSuffix = $portVersion compat >= 6
"
REQUIRES_devel="
haiku${secondaryArchSuffix}_devel
@@ -139,7 +139,7 @@ BUILD()
-DINSTALL_PUBLICBINDIR=$binDir \
-DINSTALL_PLUGINSDIR=$addOnsDir/Qt6 \
-DINSTALL_LIBDIR=$libDir \
-DINSTALL_LIBEXECDIR=$libExecDir/Qt6 \
-DINSTALL_LIBEXECDIR=$libDir/Qt6 \
-DINSTALL_DOCDIR=$docDir \
-DINSTALL_ARCHDATADIR=$dataDir/Qt6 \
-DINSTALL_DATADIR=$dataDir/Qt6 \
@@ -162,7 +162,7 @@ INSTALL()
ninja -C build install
# build platform plugins
PATH=$PATH:$binDir:$libExecDir/Qt6
PATH=$PATH:$binDir:$libDir/Qt6
mkdir -p $sourceDir2/build $preferencesDir
cd $sourceDir2/build
qmake6 ../src
@@ -188,7 +188,7 @@ INSTALL()
$libDir/cmake/Qt6DeviceDiscoverySupportPrivate/Qt6DeviceDiscoverySupportPrivateTargets-release.cmake
mkdir -p $binDir
ln -s -t $binDir $libExecDir/Qt6/{qmake6,qtpaths6}
ln -s -t $binDir $libDir/Qt6/{qmake6,qtpaths6}
rm -rf $(dirname "$docDir")