diff --git a/dev-qt/libqt4/libqt4-4.8.6.4.recipe b/dev-qt/libqt4/libqt4-4.8.6.4.recipe index 3dc452135..3e28d1ab4 100644 --- a/dev-qt/libqt4/libqt4-4.8.6.4.recipe +++ b/dev-qt/libqt4/libqt4-4.8.6.4.recipe @@ -9,7 +9,7 @@ CHECKSUM_SHA256="83bb4d74ac48443936cb497a1b53dd5683800426e829f8767cd554905d45ac6 SOURCE_DIR="qt4-4.8.6-haiku-4" LICENSE="GNU LGPL v2.1" COPYRIGHT="2014 Digia Plc and/or its subsidiary(-ies)." -REVISION="1" +REVISION="2" ARCHITECTURES="x86 ?x86_64" if [ $effectiveTargetArchitecture != x86_gcc2 ]; then # x86_gcc2 is fine as primary target architecture as long as we're building @@ -56,6 +56,8 @@ REQUIRES=" lib:libjpeg$secondaryArchSuffix lib:libpng$secondaryArchSuffix lib:libtiff$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " BUILD_REQUIRES=" @@ -82,7 +84,12 @@ BUILD_PREREQUIRES=" " if [ $targetArchitecture = x86_gcc2 ]; then + # qsystray is a deskbar replicant, it is always built for the native architecture. BUILD_PREREQUIRES="$BUILD_PREREQUIRES cmd:g++" + REQUIRES="$REQUIRES + haiku + lib:libstdc++.r4 + " fi PROVIDES_devel=" @@ -144,12 +151,14 @@ REQUIRES_devel=" lib:libz$secondaryArchSuffix lib:libssl$secondaryArchSuffix lib:libcrypto$secondaryArchSuffix + lib:libgcc_s$secondaryArchSuffix + lib:libstdc++$secondaryArchSuffix " BUILD() { # not an autotools configure - ./configure \ + CFLAGS=-D_BSD_SOURCE CXXFLAGS=-D_BSD_SOURCE ./configure \ -prefix $prefix \ -bindir $binDir \ -libdir $libDir \