From c8b0f972dfa14ec937c7824734b7a277922989c6 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 10:56:05 +0200 Subject: [PATCH 1/2] makefiles/tools: add common bossa makefile --- makefiles/tools/bossa-build.inc.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 makefiles/tools/bossa-build.inc.mk diff --git a/makefiles/tools/bossa-build.inc.mk b/makefiles/tools/bossa-build.inc.mk new file mode 100644 index 0000000000..5b32f5500e --- /dev/null +++ b/makefiles/tools/bossa-build.inc.mk @@ -0,0 +1,14 @@ +PKG_SOURCE_DIR = $(CURDIR)/bin +PKG_BUILD_OUT_OF_SOURCE = 0 + +include $(RIOTBASE)/pkg/pkg.mk + +all: $(CURDIR)/bossac + +$(CURDIR)/bossac: + @echo "[INFO] compiling bossac from source now" + @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac + @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac + +clean:: + rm -f $(CURDIR)/bossac From 09dbfd88be454a56f2a08853e575b9b3b78313c7 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 10 Jul 2020 10:59:40 +0200 Subject: [PATCH 2/2] dist/tools/bossa*: use common build Makefile --- dist/tools/bossa-1.8/Makefile | 13 +------------ dist/tools/bossa-1.9/Makefile | 13 +------------ dist/tools/bossa-nrf52/Makefile | 13 +------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/dist/tools/bossa-1.8/Makefile b/dist/tools/bossa-1.8/Makefile index 6b9b1592a7..a2b4c42dfb 100644 --- a/dist/tools/bossa-1.8/Makefile +++ b/dist/tools/bossa-1.8/Makefile @@ -3,15 +3,4 @@ PKG_URL = https://github.com/shumatech/BOSSA PKG_VERSION = 26154375695f345491bba158d57177aa231d6765 PKG_LICENSE = BSD-3-Clause -PKG_SOURCE_DIR = $(CURDIR)/bin -PKG_BUILD_OUT_OF_SOURCE = 0 - -include $(RIOTBASE)/pkg/pkg.mk - -all: - @echo "[INFO] compiling bossac from source now" - @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac - @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac - -distclean:: - @rm -f $(CURDIR)/bossac +include $(RIOTMAKE)/tools/bossa-build.inc.mk diff --git a/dist/tools/bossa-1.9/Makefile b/dist/tools/bossa-1.9/Makefile index febb787503..a63be38675 100644 --- a/dist/tools/bossa-1.9/Makefile +++ b/dist/tools/bossa-1.9/Makefile @@ -3,15 +3,4 @@ PKG_URL = https://github.com/shumatech/BOSSA PKG_VERSION = 1.9.1 PKG_LICENSE = BSD-3-Clause -PKG_SOURCE_DIR = $(CURDIR)/bin -PKG_BUILD_OUT_OF_SOURCE = 0 - -include $(RIOTBASE)/pkg/pkg.mk - -all: - @echo "[INFO] compiling bossac from source now" - @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac - @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac - -distclean:: - @rm -f $(CURDIR)/bossac +include $(RIOTMAKE)/tools/bossa-build.inc.mk diff --git a/dist/tools/bossa-nrf52/Makefile b/dist/tools/bossa-nrf52/Makefile index 45c16dadbd..02ef5469e9 100644 --- a/dist/tools/bossa-nrf52/Makefile +++ b/dist/tools/bossa-nrf52/Makefile @@ -3,15 +3,4 @@ PKG_URL = https://github.com/arduino/BOSSA PKG_VERSION = 52e0a4a28721296e64083de7780b30580e0fad16 PKG_LICENSE = BSD-3-Clause -PKG_SOURCE_DIR = $(CURDIR)/bin -PKG_BUILD_OUT_OF_SOURCE = 0 - -include $(RIOTBASE)/pkg/pkg.mk - -all: - @echo "[INFO] compiling bossac from source now" - @env -u CXX COMMON_CXXFLAGS="-std=c++11" $(MAKE) BINDIR=$(PKG_BUILD_DIR) -C $(PKG_BUILD_DIR) strip-bossac - @mv $(PKG_BUILD_DIR)/bossac $(CURDIR)/bossac - -distclean:: - @rm -f $(CURDIR)/bossac +include $(RIOTMAKE)/tools/bossa-build.inc.mk