Browse code
Added patch in mercurial-4.7.1 to disable zstd
Change-Id: I3ca8ca3a6d65b2d191c8c7d3390ab3462b010cd0
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5980
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Tested-by: Anish Swaminathan <anishs@vmware.com>
gsujayvmw authored on 2018/10/25 15:11:43Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,25 @@ |
| 0 |
+diff -Naur mercurial-4.7.1.orig/setup.py mercurial-4.7.1/setup.py |
|
| 1 |
+--- mercurial-4.7.1.orig/setup.py 2018-09-04 21:29:06.000000000 +0530 |
|
| 2 |
+@@ -440,7 +440,7 @@ |
|
| 3 |
+ negative_opt = buildextnegops |
|
| 4 |
+ |
|
| 5 |
+ def initialize_options(self): |
|
| 6 |
+- self.zstd = True |
|
| 7 |
++ self.zstd = False |
|
| 8 |
+ return build_ext.initialize_options(self) |
|
| 9 |
+ |
|
| 10 |
+ def build_extensions(self): |
|
| 11 |
+@@ -905,9 +905,9 @@ |
|
| 12 |
+ ['hgext/fsmonitor/pywatchman/bser.c']), |
|
| 13 |
+ ] |
|
| 14 |
+ |
|
| 15 |
+-sys.path.insert(0, 'contrib/python-zstandard') |
|
| 16 |
+-import setup_zstd |
|
| 17 |
+-extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd')) |
|
| 18 |
++#sys.path.insert(0, 'contrib/python-zstandard') |
|
| 19 |
++#import setup_zstd |
|
| 20 |
++#extmodules.append(setup_zstd.get_c_extension(name='mercurial.zstd')) |
|
| 21 |
+ |
|
| 22 |
+ try: |
|
| 23 |
+ from distutils import cygwinccompiler |
| ... | ... |
@@ -3,7 +3,7 @@ |
| 3 | 3 |
Summary: A free, distributed source control management tool. |
| 4 | 4 |
Name: mercurial |
| 5 | 5 |
Version: 4.7.1 |
| 6 |
-Release: 1%{?dist}
|
|
| 6 |
+Release: 2%{?dist}
|
|
| 7 | 7 |
License: GPLv2+ |
| 8 | 8 |
URL: https://www.mercurial-scm.org |
| 9 | 9 |
Group: System Environment/Security |
| ... | ... |
@@ -11,6 +11,7 @@ Vendor: VMware, Inc. |
| 11 | 11 |
Distribution: Photon |
| 12 | 12 |
Source0: https://www.mercurial-scm.org/release/%{name}-%{version}.tar.gz
|
| 13 | 13 |
%define sha1 mercurial=33e7e6abb29136ee613c347a0c48a72d978a830c |
| 14 |
+Patch0: mercurial-disable-zstd.patch |
|
| 14 | 15 |
BuildRequires: python2 |
| 15 | 16 |
BuildRequires: python2-libs |
| 16 | 17 |
BuildRequires: python2-devel |
| ... | ... |
@@ -22,6 +23,7 @@ Mercurial is written in Python and is used by projects such as Mozilla and Vim. |
| 22 | 22 |
|
| 23 | 23 |
%prep |
| 24 | 24 |
%setup -q |
| 25 |
+%patch0 -p1 |
|
| 25 | 26 |
|
| 26 | 27 |
%build |
| 27 | 28 |
make %{?_smp_mflags} build
|
| ... | ... |
@@ -57,6 +59,8 @@ rm -rf %{buildroot}/*
|
| 57 | 57 |
%{python2_sitelib}/*
|
| 58 | 58 |
|
| 59 | 59 |
%changelog |
| 60 |
+* Thu Oct 25 2018 Sujay G <gsujay@vmware.com> 4.7.1-2 |
|
| 61 |
+- Disable zstd |
|
| 60 | 62 |
* Mon Sep 10 2018 Srivatsa S. Bhat <srivatsa@csail.mit.edu> 4.7.1-1 |
| 61 | 63 |
- Update to version 4.7.1 |
| 62 | 64 |
* Tue Oct 17 2017 Xiaolin Li <xiaolinl@vmware.com> 4.3.3-1 |