From d87f55cf7c4691803e289f9c2d68d9078b64c434 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 17 Jun 2018 12:07:38 +0000 Subject: [PATCH] xaos: lib:libgsl is not available on x86_gcc2. --- haiku-apps/xaos/xaos-3.4.recipe | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/haiku-apps/xaos/xaos-3.4.recipe b/haiku-apps/xaos/xaos-3.4.recipe index eb85e3826..6ad584579 100644 --- a/haiku-apps/xaos/xaos-3.4.recipe +++ b/haiku-apps/xaos/xaos-3.4.recipe @@ -42,18 +42,17 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix " -if [ $effectiveTargetArchitecture == x86_64 ]; then +if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then REQUIRES+=" lib:libgsl$secondaryArchSuffix " fi BUILD_REQUIRES=" - devel:libgsl$secondaryArchSuffix devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix " -if [ $effectiveTargetArchitecture == x86_64 ]; then +if [ "$effectiveTargetArchitecture != x86_gcc2 ]; then BUILD_REQUIRES+=" devel:libgsl$secondaryArchSuffix " @@ -71,7 +70,7 @@ BUILD() libtoolize --force --copy --install ldflags="-lintl -liconv" configureFlags= - if [ $effectiveTargetArchitecture == x86_64 ]; then + if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then ldflags="$ldflags -lstdc++" configureFlags=--disable-cffe fi