git: afaa20a0dca2 - 2021Q4 - x11-wm/enlightenment: Enable build of armv{6,7}.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 23 Dec 2021 08:35:15 UTC
The branch 2021Q4 has been updated by arrowd:
URL: https://cgit.FreeBSD.org/ports/commit/?id=afaa20a0dca20e911866488d285783a4e757dced
commit afaa20a0dca20e911866488d285783a4e757dced
Author: Robert Clausecker <fuz@fuz.su>
AuthorDate: 2021-12-23 08:27:11 +0000
Commit: Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2021-12-23 08:35:07 +0000
x11-wm/enlightenment: Enable build of armv{6,7}.
While there, turn a bunch of `.else .if` blocks into `.elif`s.
PR: 260543
Reported by: Peter TKATCHENKO <peter@flytrace.com>
(cherry picked from commit db6a71f02193b7021526f17b687719133c5c1672)
---
x11-wm/enlightenment/Makefile | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 6a6144d5df2d..df744a7429ea 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -38,21 +38,17 @@ NLS_MESON_TRUE= nls
CURRENT_ARCH= ${ARCH}
.if ${CURRENT_ARCH} == amd64
ENLIGHTENMENT_ARCH= ${OPSYS:tl}-x86_64
-.else
-.if ${CURRENT_ARCH} == i386
+.elif ${CURRENT_ARCH} == i386
ENLIGHTENMENT_ARCH= ${OPSYS:tl}-x86
-.else
-.if ${CURRENT_ARCH:Mpowerpc64*}
+.elif ${CURRENT_ARCH:Mpowerpc64*}
ENLIGHTENMENT_ARCH= ${OPSYS:tl}-ppc64
-.else
-.if ${CURRENT_ARCH} == powerpc
+.elif ${CURRENT_ARCH} == powerpc
ENLIGHTENMENT_ARCH= ${OPSYS:tl}-ppc
+.elif ${CURRENT_ARCH:Marmv?}
+ENLIGHTENMENT_ARCH= ${OPSYS:tl}-arm
.else
ENLIGHTENMENT_ARCH= ${OPSYS:tl}-${CURRENT_ARCH}
.endif
-.endif
-.endif
-.endif
ENLIGHTENMENT_VERSION= 0.24.2
PLIST_SUB= ENLIGHTENMENT_ARCH=${ENLIGHTENMENT_ARCH}-${ENLIGHTENMENT_VERSION}