From af69c628d5a48dcc25bcf4ba69854e0644e54e32 Mon Sep 17 00:00:00 2001 From: Robert Clausecker Date: Tue, 18 May 2021 21:19:02 +0200 Subject: [PATCH] lang/mecrisp-stellaris: upgrade to 2.5.9 Also show pkg-message on aarch64 only (arm installations can clearly always run arm binaries). Also fix some portlint warnings. The remaining portlint warnings WARN: Makefile: "ONLY_FOR_ARCHS" has to appear earlier. WARN: Makefile: "ONLY_FOR_ARCHS_REASON" has to appear earlier. 0 fatal errors and 2 warnings found. cannot be fixed because options need to be defined before bsd.ports.pre.mk is included and we need bsd.ports.pre.mk to get OSVERSION for ONLY_FOR_ARCHS. But portlint wants ONLY_FOR_ARCHS before the options and that's not possibly as is. lang/mecrisp-stellaris: fix portlint warnings --- lang/mecrisp-stellaris/Makefile | 9 ++++--- lang/mecrisp-stellaris/distinfo | 6 ++--- ...isp-stellaris-source_freebsd-ra_terminal.s | 25 ------------------- .../{pkg-message => pkg-message-aarch64} | 0 4 files changed, 8 insertions(+), 32 deletions(-) delete mode 100644 lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s rename lang/mecrisp-stellaris/{pkg-message => pkg-message-aarch64} (100%) diff --git a/lang/mecrisp-stellaris/Makefile b/lang/mecrisp-stellaris/Makefile index fb5383be14b9..9bddf92a3eb8 100644 --- a/lang/mecrisp-stellaris/Makefile +++ b/lang/mecrisp-stellaris/Makefile @@ -1,6 +1,5 @@ PORTNAME= mecrisp-stellaris -DISTVERSION= 2.5.8 -PORTREVISION= 1 +DISTVERSION= 2.5.9 CATEGORIES= lang MASTER_SITES= SF/mecrisp @@ -10,6 +9,8 @@ COMMENT= Native code Forth system for ARM LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= arm-none-eabi-binutils>2.25:devel/binutils@arm_none_eabi + OPTIONS_DEFINE= EXTRAS OPTIONS_DEFAULT= EXTRAS EXTRAS_DESC= Add disassembler and math library to Forth core @@ -21,11 +22,11 @@ EXTRAS_VARS_OFF= PROGRAM=mecrisp-stellaris-freebsd .if ${OSVERSION} < 1300000 ONLY_FOR_ARCHS= armv6 armv7 .else -ONLY_FOR_ARCHS= armv6 armv7 aarch64 +ONLY_FOR_ARCHS= aarch64 armv6 armv7 .endif ONLY_FOR_ARCHS_REASON= written in ARM assembly -BUILD_DEPENDS= arm-none-eabi-binutils>2.25:devel/binutils@arm_none_eabi +PKGMESSAGE= pkg-message-${ARCH} AFLAGS.armv6= -march=armv6 --defsym m0core=1 MAKE_ENV+= AFLAGS="${AFLAGS.${ARCH}}" diff --git a/lang/mecrisp-stellaris/distinfo b/lang/mecrisp-stellaris/distinfo index 9d248bc91bfd..2a640d0a6126 100644 --- a/lang/mecrisp-stellaris/distinfo +++ b/lang/mecrisp-stellaris/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1616415161 -SHA256 (mecrisp-stellaris-2.5.8.tar.gz) = 52d82dc938b4b4b15bba6e77d20112525789e23ac982e464f9ae9274d404784e -SIZE (mecrisp-stellaris-2.5.8.tar.gz) = 5809418 +TIMESTAMP = 1621882899 +SHA256 (mecrisp-stellaris-2.5.9.tar.gz) = 56539aeb2ff8f7d36f2149410255ec683b8279feb7dbadbda4e14a96528e598a +SIZE (mecrisp-stellaris-2.5.9.tar.gz) = 5835193 diff --git a/lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s b/lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s deleted file mode 100644 index 9aecba07f8bb..000000000000 --- a/lang/mecrisp-stellaris/files/patch-mecrisp-stellaris-source_freebsd-ra_terminal.s +++ /dev/null @@ -1,25 +0,0 @@ ---- mecrisp-stellaris-source/freebsd-ra/terminal.s.orig 2021-04-10 12:49:15 UTC -+++ mecrisp-stellaris-source/freebsd-ra/terminal.s -@@ -167,7 +167,6 @@ serial_key: @ ( -- c ) Receive one character - cacheflush: - @ ----------------------------------------------------------------------------- - --.ifdef m0core - @ ARMv6 hat keine Speicherbarrieren. Das muss über einen syscall realisiert werden - push {r4-r7, lr} - movs r0, #0 @ ARM_SYNC_ICACHE -@@ -180,14 +179,6 @@ cacheflush: - @ Datenstruktur arm_sync_icache_args für den sysarch-Aufruf - 0:.word incipit - .word totalsize -- --.else -- @ auf ARMv7 und später nehmen wir einfach die Barrien-Befehle -- dmb -- dsb -- isb -- bx lr --.endif - - @ ----------------------------------------------------------------------------- - Wortbirne Flag_foldable_0, "arguments" @ ( -- a-addr ) diff --git a/lang/mecrisp-stellaris/pkg-message b/lang/mecrisp-stellaris/pkg-message-aarch64 similarity index 100% rename from lang/mecrisp-stellaris/pkg-message rename to lang/mecrisp-stellaris/pkg-message-aarch64 -- 2.31.1