diff options
Diffstat (limited to 'redhat/docker/omv5000/Dockerfile.x86_64')
| -rw-r--r-- | redhat/docker/omv5000/Dockerfile.x86_64 | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/redhat/docker/omv5000/Dockerfile.x86_64 b/redhat/docker/omv5000/Dockerfile.x86_64 index fa73aaa5b..37b186710 100644 --- a/redhat/docker/omv5000/Dockerfile.x86_64 +++ b/redhat/docker/omv5000/Dockerfile.x86_64 @@ -13,12 +13,6 @@ RUN set -x \ RUN set -x \ && chmod a+r /usr/libexec/utempter/utempter -# Prefer GCC over clang -#RUN set -x \ -# && ln -sfv ld.bfd /usr/bin/ld \ -# && ln -sfv g++ /usr/bin/c++ \ -# && ln -sfv gcc /usr/bin/cc - # Add non-root user to build packages RUN set -x \ && rm -rf /home/trinity \ @@ -37,8 +31,7 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/pycache/d" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --define "_unpackaged_files_terminate_build %nil" --nodeps \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "mkrel %nil" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --nodeps \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm RUN set -x \ @@ -47,8 +40,7 @@ RUN set -x \ RUN set -x \ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \ - && sed -i ${HOME}/rpmbuild/SPECS/rdiff-backup.spec -e "/pycache/d" \ - && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "_unpackaged_files_terminate_build %nil" \ + && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm RUN set -x \ |