git: 7834c5e34c75 - 2023Q4 - net-im/signal-desktop: Fix build on aarch64
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 10 Oct 2023 13:20:12 UTC
The branch 2023Q4 has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7834c5e34c75214ddb8117037df5526037bf322c
commit 7834c5e34c75214ddb8117037df5526037bf322c
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2023-10-10 12:22:48 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2023-10-10 13:19:46 +0000
net-im/signal-desktop: Fix build on aarch64
libvk_swiftshader is x86 only
Reported by: jhibbits
(cherry picked from commit 3f85c64afc478f6352b311dcb10b1453f8039fed)
---
net-im/signal-desktop/Makefile | 10 +++++++++-
net-im/signal-desktop/pkg-plist | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/net-im/signal-desktop/Makefile b/net-im/signal-desktop/Makefile
index 1080025b1e84..6c4dc5af9a03 100644
--- a/net-im/signal-desktop/Makefile
+++ b/net-im/signal-desktop/Makefile
@@ -104,6 +104,14 @@ PLIST_SUB= NODE_ARCH=${NODE_ARCH} \
YARN_TIMESTAMP= 1661146515
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == aarch64
+PLIST_SUB+= NOT_AARCH64="@comment "
+.elif ${ARCH} == amd64
+PLIST_SUB+= NOT_AARCH64=""
+.endif
+
fetch-yarn:
if [ ! -f ${DISTDIR}/signal-desktop-${DISTVERSION}-yarn-cache.tar.gz ]; then \
${MKDIR} /tmp/signal-desktop; \
@@ -230,4 +238,4 @@ create-caches-tarball:
cd ${WRKDIR} && \
${TAR} czf signal-desktop-${DISTVERSION}-npm-cache.tar.gz .npm
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net-im/signal-desktop/pkg-plist b/net-im/signal-desktop/pkg-plist
index c50aff9eebad..3b6939e8b8f3 100644
--- a/net-im/signal-desktop/pkg-plist
+++ b/net-im/signal-desktop/pkg-plist
@@ -8,7 +8,7 @@ share/pixmaps/signal-desktop.png
%%DATADIR%%/libEGL.so
%%DATADIR%%/libGLESv2.so
%%DATADIR%%/libffmpeg.so
-%%DATADIR%%/libvk_swiftshader.so
+%%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so
%%DATADIR%%/libvulkan.so
%%DATADIR%%/locales/af-ZA.pak
%%DATADIR%%/locales/af.pak