On 20.11.2019 9:14, Lance Yang wrote:
> To enable multiple CPU architectures support, it is necessary to move the
> x86-only addon packages from .travis.yml file. Otherwise, the x86-only
> addon packages will break the builds on some other CPU architectures.
>
> Reviewed-by: Yangqin Wei <[email protected]>
> Reviewed-by: Malvika Gupta <[email protected]>
> Reviewed-by: Gavin Hu <[email protected]>
> Reviewed-by: Ruifeng Wang <[email protected]>
> Signed-off-by: Lance Yang <[email protected]>
> ---
> .travis.yml | 2 --
> .travis/linux-prepare.sh | 12 ++++++++----
> 2 files changed, 8 insertions(+), 6 deletions(-)
Common comment for all the patches in a series:
* It's better to add a period in the end of a subject line.
>
> diff --git a/.travis.yml b/.travis.yml
> index 482efd2..2dc4d43 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -14,7 +14,6 @@ addons:
> apt:
> packages:
> - bc
> - - gcc-multilib
> - libssl-dev
> - llvm-dev
> - libjemalloc1
> @@ -26,7 +25,6 @@ addons:
> - libelf-dev
> - selinux-policy-dev
> - libunbound-dev
> - - libunbound-dev:i386
> - libunwind-dev
>
> before_install: ./.travis/${TRAVIS_OS_NAME}-prepare.sh
> diff --git a/.travis/linux-prepare.sh b/.travis/linux-prepare.sh
> index 9e3ac0d..8096abe 100755
> --- a/.travis/linux-prepare.sh
> +++ b/.travis/linux-prepare.sh
> @@ -15,10 +15,14 @@ cd ..
> pip install --disable-pip-version-check --user six flake8 hacking
> pip install --user --upgrade docutils
>
> -if [ "$M32" ]; then
> - # 32-bit and 64-bit libunwind can not be installed at the same time.
> - # This will remove the 64-bit libunwind and install 32-bit version.
> - sudo apt-get install -y libunwind-dev:i386
> +if [[ "$TRAVIS_ARCH" == "amd64" ]] || [[ -z "$TRAVIS_ARCH" ]]; then
The same comment here as for previous ppc64le patch.
Are you going to ever build 32bit binary on aarch64 on Travis?
Is it really possible to build 32bit binary on aarch64 with '-m32' flag?
> + if [ "$M32" ]; then
> + # 32-bit and 64-bit libunwind can not be installed at the same time.
> + # This will remove the 64-bit libunwind and install 32-bit version.
> + sudo apt-get install \
> + -y libunwind-dev:i386 libunbound-dev:i386 gcc-multilib
Please, add additional indentation level for above line.
> + fi
> +
> fi
>
> # IPv6 is supported by kernel but disabled in TravisCI images:
>
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
