Patchwork build: build deb/rpm independently on config/extensions in the host system

login
register
mail settings
Submitter via Mercurial-devel
Date Oct. 19, 2017, 6:46 p.m.
Message ID <08cf9bb1776828f6b4fc.1508438809@cuben>
Download mbox | patch
Permalink /patch/25252/
State Accepted
Headers show

Comments

via Mercurial-devel - Oct. 19, 2017, 6:46 p.m.
# HG changeset patch
# User muxator <a.mux@inwind.it>
# Date 1508273168 -7200
#      Tue Oct 17 22:46:08 2017 +0200
# Node ID 08cf9bb1776828f6b4fca94bc3252e1b195ecf48
# Parent  7d51a7792f52c392a7f6887d43198930c66c88be
build: build deb/rpm independently on config/extensions in the host system

Reverts 5aac617a028d and replaces it with a more general solution.

- works for both rpm and deb
- sidesteps eventual problems with local extensions that have nothing to do with
  the build process (hg-git, for example, fails with version 4.4 because
  dedab036215d removed peerrepository, and hg-git still uses it as of 0.8.9)

Patch

diff --git a/contrib/buildrpm b/contrib/buildrpm
--- a/contrib/buildrpm
+++ b/contrib/buildrpm
@@ -11,7 +11,6 @@ 
 
 BUILD=1
 RPMBUILDDIR="$PWD/rpmbuild"
-export HGPLAIN=
 
 while [ "$1" ]; do
     case "$1" in
diff --git a/contrib/packagelib.sh b/contrib/packagelib.sh
--- a/contrib/packagelib.sh
+++ b/contrib/packagelib.sh
@@ -8,6 +8,9 @@ 
 #
 # node: the node|short hg was built from, or empty if built from a tag
 gethgversion() {
+    export HGRCPATH=
+    export HGPLAIN=
+
     make cleanbutpackages
     make local PURE=--pure
     HG="$PWD/hg"