From f74ec8b4af5328c17336994c908a28d44529bb9b Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Sun, 6 Jan 2019 14:07:54 -0500 Subject: [PATCH] mercurial: ship only 64-bit version --- components/developer/mercurial/Makefile | 9 +++------ components/developer/mercurial/manifests/sample-manifest.p5m | 8 -------- components/developer/mercurial/mercurial-PYVER.p5m | 8 -------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/components/developer/mercurial/Makefile b/components/developer/mercurial/Makefile index 3b96cb650..61ef76efc 100644 --- a/components/developer/mercurial/Makefile +++ b/components/developer/mercurial/Makefile @@ -111,15 +111,12 @@ patches/manpages.patch: $(SOURCE_DIR)/.unpacked \ done > $@; \ fi || true -# Install 64-bit first, so that the 32-bit hg is what's installed. -$(INSTALL_32): $(INSTALL_64) - # common targets -build: $(BUILD_32_and_64) +build: $(BUILD_64) -install: $(INSTALL_32_and_64) +install: $(INSTALL_64) -test: install $(TEST_32_and_64) +test: install $(TEST_64) REQUIRED_PACKAGES += runtime/python-27 REQUIRED_PACKAGES += system/library diff --git a/components/developer/mercurial/manifests/sample-manifest.p5m b/components/developer/mercurial/manifests/sample-manifest.p5m index 0277344fb..d5131505d 100644 --- a/components/developer/mercurial/manifests/sample-manifest.p5m +++ b/components/developer/mercurial/manifests/sample-manifest.p5m @@ -73,7 +73,6 @@ file path=usr/lib/python2.7/vendor-packages/hgext/fix.py file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/__init__.py file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/64/bser.so file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/__init__.py -file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/bser.so file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/capabilities.py file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/compat.py file path=usr/lib/python2.7/vendor-packages/hgext/fsmonitor/pywatchman/encoding.py @@ -166,11 +165,6 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/cext/64/mpatch.so file path=usr/lib/python2.7/vendor-packages/mercurial/cext/64/osutil.so file path=usr/lib/python2.7/vendor-packages/mercurial/cext/64/parsers.so file path=usr/lib/python2.7/vendor-packages/mercurial/cext/__init__.py -file path=usr/lib/python2.7/vendor-packages/mercurial/cext/base85.so -file path=usr/lib/python2.7/vendor-packages/mercurial/cext/bdiff.so -file path=usr/lib/python2.7/vendor-packages/mercurial/cext/mpatch.so -file path=usr/lib/python2.7/vendor-packages/mercurial/cext/osutil.so -file path=usr/lib/python2.7/vendor-packages/mercurial/cext/parsers.so file path=usr/lib/python2.7/vendor-packages/mercurial/cffi/__init__.py file path=usr/lib/python2.7/vendor-packages/mercurial/cffi/bdiff.py file path=usr/lib/python2.7/vendor-packages/mercurial/cffi/bdiffbuild.py @@ -550,7 +544,6 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/ file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/__init__.py file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/_compat.py file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/_flatten.py -file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.so file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/adapter.py file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/advice.py file path=usr/lib/python2.7/vendor-packages/mercurial/thirdparty/zope/interface/declarations.py @@ -589,4 +582,3 @@ file path=usr/lib/python2.7/vendor-packages/mercurial/wireprotov1server.py file path=usr/lib/python2.7/vendor-packages/mercurial/wireprotov2peer.py file path=usr/lib/python2.7/vendor-packages/mercurial/wireprotov2server.py file path=usr/lib/python2.7/vendor-packages/mercurial/worker.py -file path=usr/lib/python2.7/vendor-packages/mercurial/zstd.so diff --git a/components/developer/mercurial/mercurial-PYVER.p5m b/components/developer/mercurial/mercurial-PYVER.p5m index d411ef2c0..743dffaee 100644 --- a/components/developer/mercurial/mercurial-PYVER.p5m +++ b/components/developer/mercurial/mercurial-PYVER.p5m @@ -89,7 +89,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fix.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/64/bser.so file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/__init__.py -file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/bser.so file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/capabilities.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/compat.py file path=usr/lib/python$(PYVER)/vendor-packages/hgext/fsmonitor/pywatchman/encoding.py @@ -182,11 +181,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/64/mpatch.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/64/osutil.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/64/parsers.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/__init__.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/base85.so -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/bdiff.so -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/mpatch.so -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/osutil.so -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cext/parsers.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cffi/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cffi/bdiff.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/cffi/bdiffbuild.py @@ -568,7 +562,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/inter file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/__init__.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/_compat.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/_flatten.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/_zope_interface_coptimizations.so file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/adapter.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/advice.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/thirdparty/zope/interface/declarations.py @@ -607,7 +600,6 @@ file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireprotov1server.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireprotov2peer.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/wireprotov2server.py file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/worker.py -file path=usr/lib/python$(PYVER)/vendor-packages/mercurial/zstd.so # license mercurial.copyright.excanvas license="Apache v2.0" license mercurial.copyright.google license="BSD 3-Clause (httpclient)" -- 2.11.4.GIT