From 2ca6db527cc3733d9254ec77616c5c46cdba5cb2 Mon Sep 17 00:00:00 2001
From: Max Payne <forgge@gmail.com>
Date: Sat, 20 Apr 2019 23:05:56 +0300
Subject: [PATCH] Fix build issues with MQTT example and python3

This commit addresses issues with building the esp_mqtt_proj example,
such as:

- Hard-coded call to python binary
- Re-defined 'packed' attribute in xtensa-lx106-elf/include/sys/cdefs.h
- Failed build due to relative paths in Makefiles

GCC compiler version: 5.2.0
Default python version: 3.7.3
---
 Makefile                        | 32 +++++++++++++++++++-------------
 examples/esp_mqtt_proj/Makefile |  7 ++++---
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index af21a78b..f5e63efb 100755
--- a/Makefile
+++ b/Makefile
@@ -4,6 +4,12 @@ ifndef PDIR
 
 endif
 
+MAKEFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
+SDKDIR := $(patsubst %/,%,$(dir $(MAKEFILE_PATH)))/
+ifndef PYTHON
+PYTHON := python
+endif
+
 ifeq ($(COMPILE), gcc)
 	AR = xtensa-lx106-elf-ar
 	CC = xtensa-lx106-elf-gcc
@@ -260,14 +266,14 @@ $(BINODIR)/%.bin: $(IMAGEODIR)/%.out
 	@mkdir -p $(BINODIR)
 	
 ifeq ($(APP), 0)
-	@$(RM) -r ../bin/eagle.S ../bin/eagle.dump
-	@$(OBJDUMP) -x -s $< > ../bin/eagle.dump
-	@$(OBJDUMP) -S $< > ../bin/eagle.S
+	@$(RM) -r $(SDKDIR)bin/eagle.S $(SDKDIR)bin/eagle.dump
+	@$(OBJDUMP) -x -s $< > $(SDKDIR)bin/eagle.dump
+	@$(OBJDUMP) -S $< > $(SDKDIR)bin/eagle.S
 else
-	mkdir -p ../bin/upgrade
-	@$(RM) -r ../bin/upgrade/$(BIN_NAME).S ../bin/upgrade/$(BIN_NAME).dump
-	@$(OBJDUMP) -x -s $< > ../bin/upgrade/$(BIN_NAME).dump
-	@$(OBJDUMP) -S $< > ../bin/upgrade/$(BIN_NAME).S
+	mkdir -p $(SDKDIR)bin/upgrade
+	@$(RM) -r $(SDKDIR)bin/upgrade/$(BIN_NAME).S $(SDKDIR)bin/upgrade/$(BIN_NAME).dump
+	@$(OBJDUMP) -x -s $< > $(SDKDIR)bin/upgrade/$(BIN_NAME).dump
+	@$(OBJDUMP) -S $< > $(SDKDIR)bin/upgrade/$(BIN_NAME).S
 endif
 
 	@$(OBJCOPY) --only-section .text -O binary $< eagle.app.v6.text.bin
@@ -279,9 +285,9 @@ endif
 	@echo "!!!"
 	
 ifeq ($(app), 0)
-	@python ../tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map) $(app)
-	@mv eagle.app.flash.bin ../bin/eagle.flash.bin
-	@mv eagle.app.v6.irom0text.bin ../bin/eagle.irom0text.bin
+	@$(PYTHON) $(SDKDIR)tools/gen_appbin.py $< 0 $(mode) $(freqdiv) $(size_map) $(app)
+	@mv eagle.app.flash.bin $(SDKDIR)bin/eagle.flash.bin
+	@mv eagle.app.v6.irom0text.bin $(SDKDIR)bin/eagle.irom0text.bin
 	@rm eagle.app.v6.*
 	@echo "No boot needed."
 	@echo "Generate eagle.flash.bin and eagle.irom0text.bin successully in folder bin."
@@ -289,10 +295,10 @@ ifeq ($(app), 0)
 	@echo "eagle.irom0text.bin---->0x10000"
 else
     ifneq ($(boot), new)
-		@python ../tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map) $(app)
+		@$(PYTHON) $(SDKDIR)tools/gen_appbin.py $< 1 $(mode) $(freqdiv) $(size_map) $(app)
 		@echo "Support boot_v1.1 and +"
     else
-		@python ../tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map) $(app)
+		@$(PYTHON) $(SDKDIR)tools/gen_appbin.py $< 2 $(mode) $(freqdiv) $(size_map) $(app)
 
     	ifeq ($(size_map), 6)
 		@echo "Support boot_v1.4 and +"
@@ -305,7 +311,7 @@ else
         endif
     endif
 
-	@mv eagle.app.flash.bin ../bin/upgrade/$(BIN_NAME).bin
+	@mv eagle.app.flash.bin $(SDKDIR)bin/upgrade/$(BIN_NAME).bin
 	@rm eagle.app.v6.*
 	@echo "Generate $(BIN_NAME).bin successully in folder bin/upgrade."
 	@echo "boot.bin------------>0x00000"
diff --git a/examples/esp_mqtt_proj/Makefile b/examples/esp_mqtt_proj/Makefile
index 79851580..c0b4077c 100644
--- a/examples/esp_mqtt_proj/Makefile
+++ b/examples/esp_mqtt_proj/Makefile
@@ -29,7 +29,7 @@ SUBDIRS=    \
 endif # } PDIR
 
 APPDIR = .
-LDDIR = ../ld
+LDDIR = ../../ld
 
 CCFLAGS += -Os
 
@@ -53,7 +53,8 @@ COMPONENTS_eagle.app.v6 = \
 	modules/libmodules.a
 
 LINKFLAGS_eagle.app.v6 = \
-	-L../lib        \
+	-L../../lib        \
+	-L../../ld        \
 	-nostdlib	\
     -T$(LD_FILE)   \
 	-Wl,--no-check-sections	\
@@ -123,7 +124,7 @@ DDEFINES +=				\
 #
 
 INCLUDES := $(INCLUDES) -I $(PDIR)include -I $(PDIR)include/mqtt -I $(PDIR)include/modules
-PDIR := ../$(PDIR)
+PDIR := ../../$(PDIR)
 sinclude $(PDIR)Makefile
 
 .PHONY: FORCE