Date: Sun, 17 Jul 2022 10:48:30 GMT From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 376a027be75d - main - emulators/dolphin-emu: Unbreak portsnap INDEX builds Message-ID: <202207171048.26HAmUbO060147@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=376a027be75d1f39a05f18ce4a766b585305ba44 commit 376a027be75d1f39a05f18ce4a766b585305ba44 Author: Ganael LAPLANCHE <martymac@FreeBSD.org> AuthorDate: 2022-07-17 10:41:45 +0000 Commit: Ganael LAPLANCHE <martymac@FreeBSD.org> CommitDate: 2022-07-17 10:41:45 +0000 emulators/dolphin-emu: Unbreak portsnap INDEX builds Using COMPILER_VERSION as llvm dependency broke portsnap INDEX builds by bringing up a dependency to llvm6. Depending on LLVM_DEFAULT should fix this. Reported by: cperciva Discussed with: cperciva, jbeich --- emulators/dolphin-emu/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index f2a6afd96032..a612042eca1e 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -2,6 +2,7 @@ PORTNAME= dolphin-emu PORTVERSION= 5.0.16795 +PORTREVISION= 1 CATEGORIES= emulators MAINTAINER= martymac@FreeBSD.org @@ -87,8 +88,9 @@ CMAKE_ARGS+= -DENABLE_GENERIC:BOOL=ON .endif .if ${CHOSEN_COMPILER_TYPE:Mclang} -CMAKE_ARGS+= -DENABLE_LLVM:BOOL=ON -LIB_DEPENDS+= libLLVM-${COMPILER_VERSION:C/.$//}.so:devel/llvm${COMPILER_VERSION:C/.$//} +CMAKE_ARGS+= -DENABLE_LLVM:BOOL=ON \ + -DLLVM_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm +LIB_DEPENDS+= libLLVM-${LLVM_DEFAULT:C/^([6-9])0/\1/}.so:devel/llvm${LLVM_DEFAULT} .else CMAKE_ARGS+= -DENABLE_LLVM:BOOL=OFF .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207171048.26HAmUbO060147>