From 19bb6aad06f89d9626d33009f3ef343cd8eb19a1 Mon Sep 17 00:00:00 2001 From: Ciyong Chen Date: Mon, 1 Jun 2020 14:45:00 +0800 Subject: [PATCH] fix ci build error --- ci/docker/install/arm64_openblas.sh | 6 +++--- ci/docker/install/centos7_core.sh | 4 ++-- ci/docker/install/ubuntu_binutils.sh | 2 +- ci/docker/install/ubuntu_caffe.sh | 4 ++-- ci/docker/install/ubuntu_core.sh | 4 ++-- ci/docker/install/ubuntu_publish.sh | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/docker/install/arm64_openblas.sh b/ci/docker/install/arm64_openblas.sh index 88f2e98cd65b..ab0ec4149891 100755 --- a/ci/docker/install/arm64_openblas.sh +++ b/ci/docker/install/arm64_openblas.sh @@ -29,7 +29,7 @@ git clone https://github.com/xianyi/OpenBLAS.git cd OpenBLAS make -j$(nproc) TARGET=ARMV8 make install -ln -s /opt/OpenBLAS/lib/libopenblas.so /usr/lib/libopenblas.so -ln -s /opt/OpenBLAS/lib/libopenblas.a /usr/lib/libopenblas.a -ln -s /opt/OpenBLAS/lib/libopenblas.a /usr/lib/liblapack.a +ln -sf /opt/OpenBLAS/lib/libopenblas.so /usr/lib/libopenblas.so +ln -sf /opt/OpenBLAS/lib/libopenblas.a /usr/lib/libopenblas.a +ln -sf /opt/OpenBLAS/lib/libopenblas.a /usr/lib/liblapack.a popd diff --git a/ci/docker/install/centos7_core.sh b/ci/docker/install/centos7_core.sh index fbdb239cf0c2..fdc6ef4513b2 100755 --- a/ci/docker/install/centos7_core.sh +++ b/ci/docker/install/centos7_core.sh @@ -41,12 +41,12 @@ yum -y install unzip yum -y install ninja-build # Centos 7 only provides ninja-build -ln -s /usr/bin/ninja-build /usr/bin/ninja +ln -sf /usr/bin/ninja-build /usr/bin/ninja # CMake 3.13.2+ is required mkdir /opt/cmake && cd /opt/cmake wget -nv https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.sh sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake --skip-license -ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake +ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake rm cmake-3.13.5-Linux-x86_64.sh cmake --version diff --git a/ci/docker/install/ubuntu_binutils.sh b/ci/docker/install/ubuntu_binutils.sh index 51e075723c65..9b38926546d0 100755 --- a/ci/docker/install/ubuntu_binutils.sh +++ b/ci/docker/install/ubuntu_binutils.sh @@ -35,4 +35,4 @@ tar -xvf binutils-2.27.tar.gz && cd binutils-2.27 ./configure --prefix=/opt/binutils_other --exec-prefix=/opt/binutils_install make -j$(nproc) make install -ls /opt/binutils_install/bin/ | xargs -I{} ln -s /opt/binutils_install/bin/{} /usr/local/bin/{} +ls /opt/binutils_install/bin/ | xargs -I{} ln -sf /opt/binutils_install/bin/{} /usr/local/bin/{} diff --git a/ci/docker/install/ubuntu_caffe.sh b/ci/docker/install/ubuntu_caffe.sh index bda1c0b8aef3..6e3f7aa5d0f0 100755 --- a/ci/docker/install/ubuntu_caffe.sh +++ b/ci/docker/install/ubuntu_caffe.sh @@ -49,8 +49,8 @@ echo "LIBRARY_DIRS += /usr/lib /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-g # Fixes https://github.com/BVLC/caffe/issues/4333 See https://github.com/intel/caffe/wiki/Ubuntu-16.04-or-15.10-Installation-Guide # Note: This is only valid on Ubuntu16.04 - the version numbers are bound to the distribution -ln -s /usr/lib/x86_64-linux-gnu/libhdf5_serial.so.10.0.2 /usr/lib/x86_64-linux-gnu/libhdf5.so -ln -s /usr/lib/x86_64-linux-gnu/libhdf5_serial_hl.so.10.0.2 /usr/lib/x86_64-linux-gnu/libhdf5_hl.so +ln -sf /usr/lib/x86_64-linux-gnu/libhdf5_serial.so.10.0.2 /usr/lib/x86_64-linux-gnu/libhdf5.so +ln -sf /usr/lib/x86_64-linux-gnu/libhdf5_serial_hl.so.10.0.2 /usr/lib/x86_64-linux-gnu/libhdf5_hl.so make all pycaffe -j$(nproc) diff --git a/ci/docker/install/ubuntu_core.sh b/ci/docker/install/ubuntu_core.sh index 2773aa26246c..fb5cb1507ab4 100755 --- a/ci/docker/install/ubuntu_core.sh +++ b/ci/docker/install/ubuntu_core.sh @@ -56,13 +56,13 @@ apt-get install -y \ # Use libturbojpeg package as it is correctly compiled with -fPIC flag # https://github.com/HaxeFoundation/hashlink/issues/147 -ln -s /usr/lib/x86_64-linux-gnu/libturbojpeg.so.0.1.0 /usr/lib/x86_64-linux-gnu/libturbojpeg.so +ln -sf /usr/lib/x86_64-linux-gnu/libturbojpeg.so.0.1.0 /usr/lib/x86_64-linux-gnu/libturbojpeg.so # CMake 3.13.2+ is required mkdir /opt/cmake && cd /opt/cmake wget -nv https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.sh sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake --skip-license -ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake +ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake rm cmake-3.13.5-Linux-x86_64.sh cmake --version diff --git a/ci/docker/install/ubuntu_publish.sh b/ci/docker/install/ubuntu_publish.sh index 4690a2c3dfad..9e6733ec20f9 100755 --- a/ci/docker/install/ubuntu_publish.sh +++ b/ci/docker/install/ubuntu_publish.sh @@ -87,6 +87,6 @@ python3 -m pip install --upgrade --ignore-installed nose cpplint==1.3.0 pylint== mkdir /opt/cmake && cd /opt/cmake wget -nv https://cmake.org/files/v3.13/cmake-3.13.5-Linux-x86_64.sh sh cmake-3.13.5-Linux-x86_64.sh --prefix=/opt/cmake --skip-license -ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake +ln -sf /opt/cmake/bin/cmake /usr/local/bin/cmake rm cmake-3.13.5-Linux-x86_64.sh cmake --version