| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From 7205761d654636a6c1fad03a3ca40d38e253e192 Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Fri, 25 Jan 2019 16:01:07 +0800 |
| 4 | Subject: [PATCH] Makefile: fix problem that waf cannot found |
| 5 | |
| 6 | tdb is subfolder of samba, but it can also build independently. |
| 7 | so both path need to be added into PATH |
| 8 | |
| 9 | Upsteam-Status: Inappropriate [oe specific] |
| 10 | |
| 11 | Fix reject by upstream since upsteam need to support both python2/3, |
| 12 | so drop add append PATH. refer link: |
| 13 | https://gitlab.com/samba-team/samba/merge_requests/209 |
| 14 | https://gitlab.com/samba-team/samba/merge_requests/211 |
| 15 | |
| 16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 17 | --- |
| 18 | Makefile | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/Makefile b/Makefile |
| 22 | index 3e70146..64bb393 100644 |
| 23 | --- a/Makefile |
| 24 | +++ b/Makefile |
| 25 | @@ -1,6 +1,6 @@ |
| 26 | # simple makefile wrapper to run waf |
| 27 | |
| 28 | -WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf |
| 29 | +WAF_BINARY=PATH=buildtools/bin:../../buildtools/bin:$$PATH waf |
| 30 | WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) |
| 31 | |
| 32 | all: |
| 33 | -- |
| 34 | 2.7.4 |
| 35 | |