edk2: drop commandSuffix, try to build on x86.

The build does not work on x86 but this could change if someone
has the enough skills, interest and time for "fixing" this.
This commit is contained in:
fbrosson
2018-09-28 11:55:42 +00:00
parent f36da4c5b0
commit e4c665acba

View File

@@ -25,14 +25,11 @@ CHECKSUM_SHA256="a37aa6dc7a4326b562ce03e225afd96a0cd1dc847d9aeddfd867ce6b2e7cc7b
SOURCE_DIR="edk2-vUDK$portVersion"
PATCHES="edk2-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 !x86 x86_64"
SECONDARY_ARCHITECTURES="!x86"
DISABLE_SOURCE_PACKAGE="yes"
commandSuffix=$secondaryArchSuffix
ARCHITECTURES="!x86_gcc2 ?x86 x86_64"
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
SECONDARY_ARCHITECTURES="?x86"
fi
DISABLE_SOURCE_PACKAGE="yes"
PROVIDES="
edk2$secondaryArchSuffix = $portVersion compat >= 0
@@ -48,7 +45,7 @@ BUILD_REQUIRES="
BUILD_PREREQUIRES="
cmd:find
cmd:gcc$secondaryArchSuffix
cmd:iasl$commandSuffix
cmd:iasl
cmd:make
cmd:nasm
cmd:python2
@@ -76,7 +73,10 @@ PATCH()
BUILD()
{
make -C BaseTools
if [ "$effectiveTargetArchitecture" = x86 ]; then
HOST_ARCH=IA32
fi
make -C BaseTools ${HOST_ARCH:+HOST_ARCH=$HOST_ARCH}
. ./edksetup.sh
local EDK_TOOLS_PATH="$sourceDir"/BaseTools
. ./edksetup.sh BaseTools