Update to latest commit & new toolchain

This commit is contained in:
Lev A. Serebryakov 2016-01-20 22:17:34 +00:00
parent 0c045e4bdb
commit bcf28ac9b4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=406813
6 changed files with 124 additions and 42 deletions

View File

@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= libopencm3
PORTVERSION= 0.0.20151015
PORTVERSION= 0.0.20160110
CATEGORIES= devel
MAINTAINER= lev@FreeBSD.org
@ -13,12 +13,15 @@ BUILD_DEPENDS= ${LOCALBASE}/gcc-arm-embedded-${TOOLCHAIN_FULL_VERSION}/bin/arm-n
USE_GITHUB= yes
GH_ACCOUNT= libopencm3
GH_TAGNAME= fbd25fb
GH_TAGNAME= ad5ec6a
USES= gmake python:2,build
USES= gmake python:2,build shebangfix
TOOLCHAIN_FULL_VERSION?=4_9-2015q3-20150921
TOOLCHAIN_PORT_VERSION?=4.9.20150921
SHEBANG_FILES= scripts/irq2nvic_h \
scripts/lpcvtcksum
TOOLCHAIN_FULL_VERSION?=5_2-2015q4-20151219
TOOLCHAIN_PORT_VERSION?=5.2.20151219
TOOLCHAIN_TARGET?=arm-none-eabi
DESTDIRNAME= STAGEDIR

View File

@ -1,2 +1,2 @@
SHA256 (libopencm3-libopencm3-0.0.20151015-fbd25fb_GH0.tar.gz) = 46497ab0ac651eed9d25c320cf8572b0bc2bef9b6b9aeaedd9cde52831aabed3
SIZE (libopencm3-libopencm3-0.0.20151015-fbd25fb_GH0.tar.gz) = 611073
SHA256 (libopencm3-libopencm3-0.0.20160110-ad5ec6a_GH0.tar.gz) = 1ed709349b5973270b66c09d220f617c973e32f86e0830c2ccc0b5bf63e46e74
SIZE (libopencm3-libopencm3-0.0.20160110-ad5ec6a_GH0.tar.gz) = 670966

View File

@ -0,0 +1,46 @@
--- Makefile.orig 2016-01-21 01:07:59.465866154 +0300
+++ Makefile 2016-01-21 01:09:35.673836966 +0300
@@ -23,6 +23,13 @@ PREFIX ?= arm-none-eabi
STYLECHECK := scripts/checkpatch.pl
STYLECHECKFLAGS := --no-tree -f --terse --mailback
+DESTDIR ?= /usr/local
+
+INCDIR := $(DESTDIR)/$(PREFIX)/include
+LIBDIR := $(DESTDIR)/$(PREFIX)/lib
+SHAREDIR := $(DESTDIR)/$(PREFIX)/share/libopencm3/scripts
+INSTALL := install
+
space:=
space+=
SRCLIBDIR:= $(subst $(space),\$(space),$(realpath lib))
@@ -64,6 +71,23 @@ $(LIB_DIRS): $(IRQ_DEFN_FILES:=.genhdr)
lib: $(LIB_DIRS)
$(Q)true
+install: lib
+ @printf " INSTALL headers\n"
+ $(Q)$(INSTALL) -d $(INCDIR)/libopencm3
+ $(Q)$(INSTALL) -d $(INCDIR)/libopencmsis
+ $(Q)$(INSTALL) -d $(LIBDIR)
+ $(Q)$(INSTALL) -d $(SHAREDIR)
+ $(Q)cp -r include/libopencm3/* $(INCDIR)/libopencm3
+ $(Q)cp -r include/libopencmsis/* $(INCDIR)/libopencmsis
+ @printf " INSTALL libs\n"
+ $(Q)$(INSTALL) -m 0644 lib/*.a $(LIBDIR)
+ @printf " INSTALL ldscripts\n"
+ $(Q)$(INSTALL) -m 0644 lib/*.ld $(LIBDIR)
+ $(Q)$(INSTALL) -m 0644 lib/efm32/*/*.ld $(LIBDIR)
+ @printf " INSTALL scripts\n"
+ $(Q)$(INSTALL) -m 0644 scripts/*.scr $(SHAREDIR)
+
+
html doc:
$(Q)$(MAKE) -C doc html
@@ -106,4 +130,4 @@ genlinktests: $(LDTESTS:.data=.ldtest)
fi;
-.PHONY: build lib $(LIB_DIRS) doc clean generatedheaders cleanheaders stylecheck genlinktests
+.PHONY: build lib $(LIB_DIRS) install doc clean generatedheaders cleanheaders stylecheck genlinktests

View File

@ -1,8 +0,0 @@
--- scripts/irq2nvic_h.orig 2014-02-15 20:35:00.000000000 +0400
+++ scripts/irq2nvic_h 2014-02-15 20:35:03.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! /usr/bin/env /usr/local/bin/python2
# This file is part of the libopencm3 project.
#

View File

@ -1,8 +0,0 @@
--- scripts/lpcvtcksum.orig 2014-02-15 20:35:10.000000000 +0400
+++ scripts/lpcvtcksum 2014-02-15 20:35:13.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#! /usr/local/bin/python2
#
# Compute and insert the vector table checksum required for booting the
# LPC43xx and some other NXP ARM microcontrollers.

View File

@ -1,5 +1,3 @@
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/%%DATADIR%%/scripts/black_magic_probe_debug.scr
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/%%DATADIR%%/scripts/black_magic_probe_flash.scr
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/cm3/assert.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/cm3/common.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/cm3/cortex.h
@ -18,20 +16,61 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/cm3/tpiu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/cm3/vector.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/dispatch/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/docmain.dox
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32g/doc-efm32g.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32g/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32g/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32gg/doc-efm32gg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32gg/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32gg/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32lg/doc-efm32lg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32lg/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32lg/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32tg/doc-efm32tg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32tg/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32tg/memorymap.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/efm32tg/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/acmp.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/adc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/burtc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/cmu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/dac.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/dma.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/emu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/g/doc-efm32g.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/g/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/g/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/gg/doc-efm32gg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/gg/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/gg/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/gpio.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/i2c.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/letimer.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/acmp.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/adc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/burtc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/cmu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/dac.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/dma.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/doc-efm32lg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/emu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/gpio.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/i2c.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/letimer.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/memorymap.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/msc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/opamp.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/prs.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/rmu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/rtc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/timer.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/uart.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/usart.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/usb.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/lg/wdog.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/memorymap.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/msc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/opamp.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/prs.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/rmu.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/rtc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/tg/doc-efm32tg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/tg/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/tg/memorymap.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/tg/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/timer.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/uart.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/usart.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/usb.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/efm32/wdog.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/ethernet/mac.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/ethernet/mac_stm32fxx7.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/ethernet/phy.h
@ -358,6 +397,11 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/st_usbf
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/syscfg.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/timer.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l1/usart.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/gpio.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/irq.json
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/memorymap.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/l4/rcc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/ltdc.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/memorymap.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/stm32/otg_common.h
@ -395,10 +439,10 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/vf6xx/nvic.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencm3/vf6xx/uart.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/core_cm3.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/dispatch/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/efm32g/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/efm32gg/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/efm32lg/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/efm32tg/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/g/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/gg/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/lg/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/efm32/tg/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/lm3s/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/lpc13xx/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/lpc17xx/irqhandlers.h
@ -417,6 +461,7 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/stm32/f4/irqha
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/stm32/f7/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/stm32/l0/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/stm32/l1/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/stm32/l4/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/include/libopencmsis/vf6xx/irqhandlers.h
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32g.a
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_efm32g.ld
@ -468,5 +513,9 @@ gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l0.a
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l0.ld
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l1.a
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l1.ld
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l4.a
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_stm32l4.ld
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_vf6xx.a
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/lib/libopencm3_vf6xx.ld
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/%%DATADIR%%/scripts/black_magic_probe_debug.scr
gcc-arm-embedded-%%FULL_VERSION%%/%%TARGET%%/%%DATADIR%%/scripts/black_magic_probe_flash.scr