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

login
register
mail settings
Submitter phabricator
Date July 27, 2017, 12:46 p.m.
Message ID <differential-rev-PHID-DREV-kabugj3captfgl27k3tm-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/22562/
State Superseded, archived
Headers show

Comments

phabricator - July 27, 2017, 12:46 p.m.
Mathiasdm created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  Makefile
  contrib/docker/centos6

CHANGE DETAILS




To: Mathiasdm, #hg-reviewers
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
@@ -275,13 +275,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