Patchwork [STABLE] make: backout changeset 51f5fae84e43

login
register
mail settings
Submitter Siddharth Agarwal
Date April 25, 2016, 11:34 p.m.
Message ID <a62e1dbb9f9d52fd0002.1461627255@dev666.prn1.facebook.com>
Download mbox | patch
Permalink /patch/14789/
State Accepted
Commit c05cc1b958488b15f494bad16e004d25416fd5ff
Headers show

Comments

Siddharth Agarwal - April 25, 2016, 11:34 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1461627242 25200
#      Mon Apr 25 16:34:02 2016 -0700
# Branch stable
# Node ID a62e1dbb9f9d52fd00024e4632d88c0fbccd1d3c
# Parent  38292b227debf6393dc1e2c6ff886f85f6673646
make: backout changeset 51f5fae84e43

Support for '!=' was only added in GNU Make 4.0, and CentOS versions as new as
CentOS 7 only carry 3.82.

I will leave figuring out compatibility with BSD make as an exercise for
interested folks.
Siddharth Agarwal - April 27, 2016, 8:06 p.m.
On 4/25/16 16:34, Siddharth Agarwal wrote:
> # HG changeset patch
> # User Siddharth Agarwal <sid0@fb.com>
> # Date 1461627242 25200
> #      Mon Apr 25 16:34:02 2016 -0700
> # Branch stable
> # Node ID a62e1dbb9f9d52fd00024e4632d88c0fbccd1d3c
> # Parent  38292b227debf6393dc1e2c6ff886f85f6673646
> make: backout changeset 51f5fae84e43

Looks like this was queued up in @. Thanks.

>
> Support for '!=' was only added in GNU Make 4.0, and CentOS versions as new as
> CentOS 7 only carry 3.82.
>
> I will leave figuring out compatibility with BSD make as an exercise for
> interested folks.
>
> diff --git a/Makefile b/Makefile
> --- a/Makefile
> +++ b/Makefile
> @@ -6,7 +6,7 @@
>   
>   export PREFIX=/usr/local
>   PYTHON=python
> -HGROOT != pwd
> +$(eval HGROOT := $(shell pwd))
>   HGPYTHONS ?= $(HGROOT)/build/pythons
>   PURE=
>   PYFILES:=$(shell find mercurial hgext doc -name '*.py')
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ 
 
 export PREFIX=/usr/local
 PYTHON=python
-HGROOT != pwd
+$(eval HGROOT := $(shell pwd))
 HGPYTHONS ?= $(HGROOT)/build/pythons
 PURE=
 PYFILES:=$(shell find mercurial hgext doc -name '*.py')