Patchwork D189: makefile: build on CentOS 6 with a Python 2.7

login
register
mail settings
Submitter phabricator
Date July 27, 2017, 7:59 p.m.
Message ID <5119f4e3d2072df72056d6f5157568e2@localhost.localdomain>
Download mbox | patch
Permalink /patch/22568/
State Not Applicable
Headers show

Comments

phabricator - July 27, 2017, 7:59 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGaf09413deb72: makefile: build on CentOS 6 with a Python 2.7 (authored by Mathiasdm).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D189?vs=425&id=430

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

AFFECTED FILES
  Makefile
  contrib/docker/centos6

CHANGE DETAILS




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

Patch

diff --git a/contrib/docker/centos6 b/contrib/docker/centos6
--- a/contrib/docker/centos6
+++ b/contrib/docker/centos6
@@ -7,3 +7,5 @@ 
 RUN yum install -y tar
 # For creating repo meta data
 RUN yum install -y createrepo
+# For python
+RUN yum install -y readline-devel openssl-devel ncurses-devel zlib-devel bzip2-devel
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -276,13 +276,13 @@ 
 
 centos6:
 	mkdir -p packages/centos6
-	contrib/buildrpm
+	contrib/buildrpm --withpython
 	cp rpmbuild/RPMS/*/* packages/centos6
 	cp rpmbuild/SRPMS/* packages/centos6
 
 docker-centos6:
 	mkdir -p packages/centos6
-	contrib/dockerrpm centos6
+	contrib/dockerrpm centos6 --withpython
 
 centos7:
 	mkdir -p packages/centos7