Merge pull request #6728 from kaspar030/introduce_pkgdirbase

make: introduce PKGDIRBASE

Makefile.include

@@ -14,8 +14,9 @@ GITCACHE       ?= $(RIOTBASE)/dist/tools/git/git-cache
 APPDIR         ?= $(CURDIR)
 BINDIRBASE     ?= $(APPDIR)/bin
 BINDIR         ?= $(BINDIRBASE)/$(BOARD)
+PKGDIRBASE     ?= $(BINDIRBASE)/pkg/$(BOARD)
 
-__DIRECTORY_VARIABLES := RIOTBASE CCACHE_BASEDIR RIOTCPU RIOTBOARD RIOTPKG GITCACHE RIOTPROJECT APPDIR BINDIRBASE BINDIR
+__DIRECTORY_VARIABLES := RIOTBASE CCACHE_BASEDIR RIOTCPU RIOTBOARD RIOTPKG GITCACHE RIOTPROJECT APPDIR BINDIRBASE BINDIR PKGDIRBASE
 
 # Make all paths absolute.
 override RIOTBASE       := $(abspath $(RIOTBASE))
@@ -28,6 +29,7 @@ override GITCACHE       := $(abspath $(GITCACHE))
 override APPDIR         := $(abspath $(APPDIR))
 override BINDIRBASE     := $(abspath $(BINDIRBASE))
 override BINDIR         := $(abspath $(BINDIR))
+override PKGDIRBASE     := $(abspath $(PKGDIRBASE))
 
 # Ensure that all directories are set and don't contain spaces.
 ifneq (, $(filter-out 1, $(foreach v,${__DIRECTORY_VARIABLES},$(words ${${v}}))))

Makefile.vars

@@ -22,6 +22,7 @@ export RIOTPROJECT           # Top level git root of the project being built, or
 export BINDIRBASE            # This is the folder where the application should be built in. For each BOARD a different subfolder is used.
 export BINDIR                # This is the folder where the application should be built in.
 export APPDIR                # The base folder containing the application
+export PKGDIRBASE            # The base folder for building packages
 
 export TARGET_ARCH           # The target platform name, in GCC triple notation, e.g. "arm-none-eabi", "i686-elf", "avr"
 export PREFIX                # The prefix of the toolchain commands, usually "$(TARGET_ARCH)-", e.g. "arm-none-eabi-" or "msp430-".

pkg/aversiveplusplus/Makefile.include

@@ -1,4 +1,4 @@
-AVERSIVEPLUSPLUS_MODULES_DIR = $(BINDIRBASE)/pkg/$(BOARD)/aversiveplusplus/modules
+AVERSIVEPLUSPLUS_MODULES_DIR = $(PKGDIRBASE)/aversiveplusplus/modules
 
 INCLUDES += -I$(AVERSIVEPLUSPLUS_MODULES_DIR)/base/include
 INCLUDES += -I$(AVERSIVEPLUSPLUS_MODULES_DIR)/container/include

pkg/ccn-lite/Makefile.include

@@ -1,4 +1,4 @@
-INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(BINDIRBASE)/pkg/$(BOARD)/ccn-lite/src
+INCLUDES += -I$(RIOTPKG)/ccn-lite -I$(PKGDIRBASE)/ccn-lite/src
 INCLUDES += -I$(RIOTBASE)/sys/posix/include
 
 CFLAGS += -DCCNL_RIOT

pkg/cmsis-dsp/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/cmsis-dsp/include
+INCLUDES += -I$(PKGDIRBASE)/cmsis-dsp/include

pkg/emb6/Makefile.include

@@ -1,4 +1,4 @@
-PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/emb6
+PKG_BUILDDIR ?= $(PKGDIRBASE)/emb6
 EMB6_DIR := $(PKG_BUILDDIR)
 EMB6_CONTRIB := $(RIOTBASE)/pkg/emb6/contrib
 

pkg/heatshrink/Makefile.include

@@ -1,2 +1,2 @@
 CFLAGS += -DHEATSHRINK_DYNAMIC_ALLOC=0
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/heatshrink
+INCLUDES += -I$(PKGDIRBASE)/heatshrink

pkg/jsmn/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/jsmn
+INCLUDES += -I$(PKGDIRBASE)/jsmn

pkg/libcoap/Makefile.include

@@ -1,3 +1,3 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/libcoap \
+INCLUDES += -I$(PKGDIRBASE)/libcoap \
 			-I$(RIOTBASE)/sys/posix/include \
 			-I$(RIOTBASE)/sys/net/include

pkg/libfixmath/Makefile.include

@@ -1,4 +1,4 @@
-PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/libfixmath
+PKG_BUILDDIR ?= $(PKGDIRBASE)/libfixmath
 
 # The static cache is huge, disable it.
 CFLAGS += -DFIXMATH_NO_CACHE

pkg/lwip/Makefile.include

@@ -1,5 +1,5 @@
 INCLUDES += -I$(RIOTBASE)/pkg/lwip/include \
-            -I$(BINDIRBASE)/pkg/$(BOARD)/lwip/src/include
+            -I$(PKGDIRBASE)/lwip/src/include
 
 ifneq (,$(filter lwip_conn,$(USEMODULE)))
   DIRS += $(RIOTBASE)/pkg/lwip/contrib/conn

pkg/micro-ecc/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/micro-ecc
+INCLUDES += -I$(PKGDIRBASE)/micro-ecc

pkg/microcoap/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/microcoap
+INCLUDES += -I$(PKGDIRBASE)/microcoap

pkg/nanocoap/Makefile.include

@@ -1,2 +1,2 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/nanocoap/nanocoap
+INCLUDES += -I$(PKGDIRBASE)/nanocoap/nanocoap
 INCLUDES += -I$(RIOTBASE)/sys/posix/include

pkg/nordic_softdevice_ble/Makefile

@@ -4,7 +4,7 @@ PKG_FILE = nrf5_iot_sdk_$(PKG_VERSION).zip
 PKG_URL = https://developer.nordicsemi.com/nRF5_IoT_SDK/nRF5_IoT_SDK_v0.9.x/$(PKG_FILE)
 PKG_LICENSE = nordic-bsd
 PKG_DIR=$(CURDIR)
-PKG_BUILDDIR=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
+PKG_BUILDDIR=$(PKGDIRBASE)/$(PKG_NAME)
 PKG_SRCDIR=$(PKG_BUILDDIR)/src
 
 SOFTDEVICE := components/softdevice/s1xx_iot/s1xx-iot-prototype3_nrf52_softdevice.hex

pkg/nordic_softdevice_ble/Makefile.include

@@ -1,4 +1,4 @@
-NORDIC_SRCS := $(BINDIRBASE)/pkg/$(BOARD)/nordic_softdevice_ble/src
+NORDIC_SRCS := $(PKGDIRBASE)/nordic_softdevice_ble/src
 
 INCLUDES += \
 			-I$(RIOTBASE)/pkg/nordic_softdevice_ble/src \

pkg/oonf_api/Makefile.include

@@ -1,4 +1,4 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/oonf_api/src-api
+INCLUDES += -I$(PKGDIRBASE)/oonf_api/src-api
 
 ifeq ($(shell uname -s),Darwin)
 	CFLAGS += -Wno-reserved-id-macro -Wno-keyword-macro

pkg/pkg.mk

@@ -2,7 +2,7 @@
 # Include this file if your Package needs to be checked out by git
 #
 PKG_DIR?=$(CURDIR)
-PKG_BUILDDIR?=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
+PKG_BUILDDIR?=$(PKGDIRBASE)/$(PKG_NAME)
 
 .PHONY: git-download clean
 

pkg/relic/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/relic/include
+INCLUDES += -I$(PKGDIRBASE)/relic/include

pkg/tiny-asn1/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/tiny-asn1/src
+INCLUDES += -I$(PKGDIRBASE)/tiny-asn1/src

pkg/tinydtls/Makefile.include

@@ -1,4 +1,4 @@
-PKG_BUILDDIR ?= $(BINDIRBASE)/pkg/$(BOARD)/tinydtls
+PKG_BUILDDIR ?= $(PKGDIRBASE)/tinydtls
 
 INCLUDES += -I$(PKG_BUILDDIR)
 

pkg/tlsf/Makefile

@@ -4,7 +4,7 @@ PKG_FILE = tlsf-$(PKG_VERSION).zip
 PKG_URL = http://download.riot-os.org/$(PKG_FILE)
 PKG_LICENSE = PD
 PKG_DIR=$(CURDIR)
-PKG_BUILDDIR=$(BINDIRBASE)/pkg/$(BOARD)/$(PKG_NAME)
+PKG_BUILDDIR=$(PKGDIRBASE)/$(PKG_NAME)
 PKG_SRCDIR=$(PKG_BUILDDIR)/src
 
 .PHONY: all clean distclean

pkg/tlsf/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/tlsf/src
+INCLUDES += -I$(PKGDIRBASE)/tlsf/src

pkg/tweetnacl/Makefile.include

@@ -1 +1 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/tweetnacl/
+INCLUDES += -I$(PKGDIRBASE)/tweetnacl/

pkg/u8g2/Makefile.include

@@ -1,4 +1,4 @@
-INCLUDES += -I$(BINDIRBASE)/pkg/$(BOARD)/u8g2/csrc
+INCLUDES += -I$(PKGDIRBASE)/u8g2/csrc
 
 # Link SDL if enabled.
 ifneq (,$(filter u8g2_sdl,$(USEMODULE)))