Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Nov 2021 21:18:52 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 5fef75707eb5 - main - graphics/photoflare: fix build on armv7
Message-ID:  <202111232118.1ANLIqj6077708@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pkubaj:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5fef75707eb52cce91a65059bab67c1368071b1f

commit 5fef75707eb52cce91a65059bab67c1368071b1f
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-11-23 21:11:28 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-11-23 21:11:28 +0000

    graphics/photoflare: fix build on armv7
    
    Same issue as on powerpc.
---
 Mk/Uses/qt-dist.mk           | 2 +-
 graphics/photoflare/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index ec1c314b175d..3611e949b00b 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -177,7 +177,7 @@ _EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
 USE_GCC=		yes
-.    elif ${ARCH} == powerpc
+.    elif ${ARCH} == armv7 || ${ARCH} == powerpc
 _EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
diff --git a/graphics/photoflare/Makefile b/graphics/photoflare/Makefile
index 22fc1f4164e2..81046b274a53 100644
--- a/graphics/photoflare/Makefile
+++ b/graphics/photoflare/Makefile
@@ -24,7 +24,7 @@ LDFLAGS_gcc=	-fopenmp
 
 .include <bsd.port.options.mk>
 
-.if ${ARCH} == powerpc
+.if ${ARCH} == armv7 || ${ARCH} == powerpc
 USES+=		compiler:gcc-c++11-lib
 .else
 USES+=		compiler:c++17-lang



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202111232118.1ANLIqj6077708>