Patchwork D10877: packaging: disable rust extensions again on CentOS

login
register
mail settings
Submitter phabricator
Date June 15, 2021, 7:06 a.m.
Message ID <differential-rev-PHID-DREV-bhe2t6zxwwlec34hpdw5-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49198/
State Superseded
Headers show

Comments

phabricator - June 15, 2021, 7:06 a.m.
Mathiasdm created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  Backed out changeset eccbfa7e19c0 <https://phab.mercurial-scm.org/rHGeccbfa7e19c04b13b82c77daea528eda36d6a437>
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D10877

AFFECTED FILES
  contrib/packaging/docker/centos7
  contrib/packaging/docker/centos8
  contrib/packaging/mercurial.spec

CHANGE DETAILS




To: Mathiasdm, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/contrib/packaging/mercurial.spec b/contrib/packaging/mercurial.spec
--- a/contrib/packaging/mercurial.spec
+++ b/contrib/packaging/mercurial.spec
@@ -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
 
diff --git a/contrib/packaging/docker/centos8 b/contrib/packaging/docker/centos8
--- a/contrib/packaging/docker/centos8
+++ b/contrib/packaging/docker/centos8
@@ -13,6 +13,3 @@ 
 
 # For creating repo meta data
 RUN yum install -y createrepo
-
-# For rust extensions
-RUN yum install -y cargo
diff --git a/contrib/packaging/docker/centos7 b/contrib/packaging/docker/centos7
--- a/contrib/packaging/docker/centos7
+++ b/contrib/packaging/docker/centos7
@@ -15,6 +15,3 @@ 
 
 # For creating repo meta data
 RUN yum install -y createrepo
-
-# For rust extensions
-RUN yum install -y cargo