Rewrite ARCHITECTURES syntax to new HaikuPorter changes.

HaikuPorter now does not care what is in ARCHITECTURES when
building for a SECONDARY_ARCHITECTURE.
This commit is contained in:
Augustin Cavalier
2015-08-04 11:59:44 -04:00
parent 23faff5dbc
commit 55dd9cf19d
304 changed files with 377 additions and 1991 deletions

View File

@@ -24,14 +24,7 @@ CHECKSUM_SHA256="1e47f293e0857ffde2bccead97947c040ea0b35ea12dd5796edb51583e5e5d8
SOURCE_DIR="festival"
PATCHES="festival-${portVersion}.patchset"
ARCHITECTURES="x86_gcc2 x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
PROVIDES="
@@ -89,7 +82,7 @@ BUILD()
-e "s,@LIBDIR@,$libDir/festival,g" \
${f}.in > ${f}
done
make
}

View File

@@ -28,14 +28,7 @@ COPYRIGHT="
1999-2003 Language Technologies Institute, Carnegie Mellon University
"
ARCHITECTURES="x86 x86_64"
if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
# x86_gcc2 is fine as primary target architecture as long as we're building
# for a different secondary architecture.
ARCHITECTURES="$ARCHITECTURES x86_gcc2"
else
ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
fi
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86 !x86_gcc2"
PROVIDES="