Mercurial > hg-stable

changeset 47048:9b8f326731ac stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: disable rust extensions again on CentOS Backed out changeset eccbfa7e19c0 We're seeing (very rarely) crashes of 'hg purge' on some of our machines (see https://bz.mercurial-scm.org/show_bug.cgi?id=6509 ). Unfortunately, I haven't been able to find out much more about what is going wrong. To avoid further impact on our users and CI, I would prefer to disable the rust extensions for now. Differential Revision: https://phab.mercurial-scm.org/D10877
author Mathias De Mare <mathias.de_mare@nokia.com>
date Tue, 15 Jun 2021 09:06:12 +0200
parents 9f798c1b0d89
children 25d36300ba8e
files contrib/packaging/docker/centos7 contrib/packaging/docker/centos8 contrib/packaging/mercurial.spec
diffstat 3 files changed, 2 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/packaging/docker/centos7	Sun Jun 06 01:24:30 2021 +0200
+++ b/contrib/packaging/docker/centos7	Tue Jun 15 09:06:12 2021 +0200
@@ -15,6 +15,3 @@
 
 # For creating repo meta data
 RUN yum install -y createrepo
-
-# For rust extensions
-RUN yum install -y cargo
--- a/contrib/packaging/docker/centos8	Sun Jun 06 01:24:30 2021 +0200
+++ b/contrib/packaging/docker/centos8	Tue Jun 15 09:06:12 2021 +0200
@@ -13,6 +13,3 @@
 
 # For creating repo meta data
 RUN yum install -y createrepo
-
-# For rust extensions
-RUN yum install -y cargo
--- a/contrib/packaging/mercurial.spec	Sun Jun 06 01:24:30 2021 +0200
+++ b/contrib/packaging/mercurial.spec	Tue Jun 15 09:06:12 2021 +0200
@@ -110,14 +110,14 @@
 LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py install --root="$RPM_BUILD_ROOT"
 cd -
 
-PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust"
+PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . )
 ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} )
 
 %else
 
-make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir} PURE="--rust"
+make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir}
 
 %endif