Merge "Switch from yasm to nasm"
This commit is contained in:
commit
97aa0f90c9
|
@ -7,8 +7,6 @@ make [platform:rpm]
|
|||
autoconf
|
||||
automake
|
||||
libtool
|
||||
# yasm exists everywhere but CentOS 7
|
||||
yasm [!platform:centos]
|
||||
liberasurecode-dev [platform:dpkg]
|
||||
# There's no library in CentOS 7 but Fedora and openSUSE have it.
|
||||
liberasurecode-devel [platform:rpm !platform:centos]
|
||||
|
|
|
@ -4,9 +4,25 @@ if [ -z "$VIRTUAL_ENV" ]; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if [ -n "$NASM_DIR" ]; then
|
||||
if [ ! -d "$NASM_DIR" ]; then
|
||||
mkdir -p "$NASM_DIR"
|
||||
pushd "$NASM_DIR"
|
||||
curl https://www.nasm.us/pub/nasm/releasebuilds/2.16.01/nasm-2.16.01.tar.gz | tar -xz
|
||||
popd
|
||||
fi
|
||||
pushd "$NASM_DIR"/nasm*
|
||||
./autogen.sh
|
||||
./configure --prefix "$VIRTUAL_ENV"
|
||||
make nasm
|
||||
install -c nasm "$VIRTUAL_ENV"/bin/nasm
|
||||
PATH="$VIRTUAL_ENV/bin:$PATH"
|
||||
popd
|
||||
fi
|
||||
|
||||
if [ -n "$ISAL_DIR" ]; then
|
||||
if [ ! -d "$ISAL_DIR" ]; then
|
||||
git clone https://github.com/intel/isa-l.git -b v2.30.0 "$ISAL_DIR"
|
||||
git clone https://github.com/intel/isa-l.git "$ISAL_DIR"
|
||||
fi
|
||||
pushd "$ISAL_DIR"
|
||||
./autogen.sh
|
||||
|
|
|
@ -23,12 +23,12 @@ if is_rhel7; then
|
|||
sudo yum install -y centos-release-openstack-train
|
||||
# Now that RDO repositories are enabled, install missing
|
||||
# packages.
|
||||
sudo yum install -y liberasurecode-devel yasm
|
||||
sudo yum install -y liberasurecode-devel
|
||||
fi
|
||||
|
||||
if is_rhel8; then
|
||||
# Install CentOS OpenStack repos so that we have access to some extra
|
||||
# packages.
|
||||
sudo dnf install -y centos-release-openstack-ussuri
|
||||
sudo dnf install -y liberasurecode-devel yasm
|
||||
sudo dnf install -y liberasurecode-devel
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue