diff --git a/.circleci/config.yml b/.circleci/config.yml index 74dacb1..5e4cff4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -25,6 +25,17 @@ jobs: conda install --yes cython gdal h5py libgdal pytest numpy fftw scipy basemap scons opencv hdf4 hdf5 netcdf4 libgcc libstdcxx-ng cmake yum install -y uuid-devel x11-devel motif-devel jq ln -s /opt/conda/bin/cython /opt/conda/bin/cython3 + cd /opt/conda/lib + unlink libuuid.so + unlink libuuid.so.1 + ln -s /lib64/libuuid.so.1.3.0 libuuid.so + ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1 + yum install -y gcc-gfortran + cd /opt/conda/lib + unlink libgfortran.so + unlink libgfortran.so.4 + ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so + ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so.4 mkdir config build install - run: @@ -46,7 +57,6 @@ jobs: echo "MOTIFINCPATH = /usr/include" >> SConfigISCE echo "X11INCPATH = /usr/include" >> SConfigISCE echo "RPATH = /opt/conda/lib /usr/lib64 /usr/lib" >> SConfigISCE - echo "LINKFLAGS = -luuid" >> SConfigISCE cat SConfigISCE - run: diff --git a/docker/Dockerfile b/docker/Dockerfile index cfd75ec..252f2f2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -42,6 +42,23 @@ RUN set -ex \ && yum install -y uuid-devel x11-devel motif-devel jq \ && ln -sf /opt/conda/bin/cython /opt/conda/bin/cython3 +# link system libuuid +RUN set -ex \ + && cd /opt/conda/lib \ + && unlink libuuid.so \ + && unlink libuuid.so.1 \ + && ln -s /lib64/libuuid.so.1.3.0 libuuid.so \ + && ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1 + +# install libgfortran.so.3 +RUN set -ex \ + && yum install -y gcc-gfortran \ + && cd /opt/conda/lib \ + && unlink libgfortran.so \ + && unlink libgfortran.so.4 \ + && ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so \ + && ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so.4 + # copy repo COPY . /root/isce2 @@ -91,6 +108,16 @@ RUN set -ex \ netcdf4 \ && sudo yum update -y \ && sudo yum install -y uuid-devel x11-devel motif-devel \ + && cd /opt/conda/lib \ + && sudo unlink libuuid.so \ + && sudo unlink libuuid.so.1 \ + && sudo ln -s /lib64/libuuid.so.1.3.0 libuuid.so \ + && sudo ln -s /lib64/libuuid.so.1.3.0 libuuid.so.1 \ + && sudo yum install -y gcc-gfortran \ + && sudo unlink libgfortran.so \ + && sudo unlink libgfortran.so.4 \ + && sudo ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so \ + && sudo ln -s /lib64/libgfortran.so.3.0.0 libgfortran.so.4 \ && sudo yum install -y /tmp/isce-2.0-1.x86_64.rpm \ && sudo yum clean all \ && sudo rm -rf /var/cache/yum \ diff --git a/docker/SConfigISCE b/docker/SConfigISCE index 33aa38e..8db9971 100644 --- a/docker/SConfigISCE +++ b/docker/SConfigISCE @@ -36,9 +36,6 @@ X11INCPATH = /usr/include # path to location of the X11 directory # list of paths to search for shared libraries when running programs RPATH = /opt/conda/lib /usr/lib64 /usr/lib -# additional linker flags -LINKFLAGS = -luuid - #Explicitly enable cuda if needed ENABLE_CUDA = True #CUDA_TOOLKIT_PATH = $YOUR_CUDA_INSTALLATION #/usr/local/cuda