Thread (6 messages) 6 messages, 5 authors, 2018-02-05

Re: [PATCH v2] mk: support renamed Makefile in external project

From: Bruce Richardson <hidden>
Date: 2018-02-05 10:00:41

On Mon, Feb 05, 2018 at 09:53:53AM +0000, Marko Kovacevic wrote:
quoted hunk ↗ jump to hunk
The build system made a recursive call to "make" after
creating the build directory. This recursive call used
the hard-coded filename "Makefile", which prevented
builds from working if the file was renamed and make
called using "make -f". Taking the filename from
MAKEFILES_LIST make variable fixes this.

Fixes: af75078fece3 ("first public release")
Cc: stable@dpdk.org

Signed-off-by: Marko Kovacevic <redacted>
Acked-by: Vipin Varghese <redacted>

---
V2
 - Changed the call of the make file a litte
   due to an issue reported by Olivier.
---
 mk/internal/rte.extvars.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mk/internal/rte.extvars.mk b/mk/internal/rte.extvars.mk
index 94f27e9..98c8606 100644
--- a/mk/internal/rte.extvars.mk
+++ b/mk/internal/rte.extvars.mk
@@ -20,7 +20,7 @@ ifeq ("$(origin M)", "command line")
 RTE_EXTMK := $(abspath $(M))
 endif
 endif
-RTE_EXTMK ?= $(RTE_SRCDIR)/Makefile
+RTE_EXTMK ?= $(RTE_SRCDIR)/$(notdir $(firstword $(MAKEFILE_LIST)))
 export RTE_EXTMK
 
 # RTE_SDK_BIN must point to .config, include/ and lib/.
-- 
Since the V1 of the patch was already applied, I think this needs a new
patch on top of (i.e. fixing) the V1, rather than a V2 version.

/Bruce
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help