From nobody Sun Jul 17 10:48:30 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lm1zM2532z4WvDj; Sun, 17 Jul 2022 10:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lm1zM1Kd9z3McW; Sun, 17 Jul 2022 10:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658054911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SO96L/veuid3OsNNnDeeOhrve03J+jY/EDXPLwooVas=; b=vBS2Ce+B/vqFdVAQWdp4mLR7yGJBn+VHi/lJ4M7gSNMHdb4fS0CuQMD/9TTakCNRmK8O3P zH2JZIwM2NXM0rljHCBZfzmlY2Is3V6879voy5djyykvE0GARfFsSXLSVw6KwI96HbEcYJ A9dQtrVADM+qb92mY/pAyOyajBBIWnsCJHOcc+Ouyks9K845FSYBfmEsK2wRmOPdMDU/d2 5FOQwnky5gxkqa9BTtqEiJjhVi1ctiR9gM6sxgQ1j1g3HWz05iOTaGNmMu0W75TW2QID26 Pop8CxXinwxVxsttS+cLi0LaD1wVhFHRCmQZJ3qxdKGJTh3PhMHkqpCtx5AxUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lm1zM07D1zxVr; Sun, 17 Jul 2022 10:48:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26HAmUJq060148; Sun, 17 Jul 2022 10:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26HAmUbO060147; Sun, 17 Jul 2022 10:48:30 GMT (envelope-from git) Date: Sun, 17 Jul 2022 10:48:30 GMT Message-Id: <202207171048.26HAmUbO060147@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 376a027be75d - main - emulators/dolphin-emu: Unbreak portsnap INDEX builds List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 376a027be75d1f39a05f18ce4a766b585305ba44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658054911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SO96L/veuid3OsNNnDeeOhrve03J+jY/EDXPLwooVas=; b=DeaY/Fl9K3TlVAcLZKT2AikiROivYS07DnwyMGG+Mw0GIup6NI6VX15sGjD66LI5EtcWb2 /KpsRx5GQJv9OQp2L0yc8w4SpomQ3a7DYwMiaeYkkltbchP60fw/wsHRGiio7FeXuGwUM5 NQpIorNHvFiflRchDK4/Z//oSsmur6ljyjRtKaG+sdsiZ4bihbW77QxIfEtcOJFoNZbdsl Q4Gwx228pRWhX0aNiBSvPzZ83Sk9MD8Dq9Gi6Ns0yCvtReftQjXR9CzTrtAJxll957Db4/ gIPbmIu18bH0m1a5f/SyGfXffRJL/VkV6Lk0fjwp4+CN1U6ZmOo92i2S3bNpHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658054911; a=rsa-sha256; cv=none; b=xdDqcVhxo7tQ8X26s7eeNE7wTwuMYADcRU9pgW8RBeCIgTbVG48R5zd3eOwl8tpfVNvXhy ZgJFQWzoGaZlFKcBnRc+OUHTsMzwhdq2trLDdJ8UTYKeD+JGlIyfiX251oWe1/+4DstOjD 0R57pP1YFT7CDJaIBJkpNyM7AOgxDl11le157Fh5xS5dUt652JtJwrM4+oq8B+TztDGAbi 0htsH7Ha6Bks2LiHsUYqbkF3/M3Q40FnRskSMOW+0zXSDsQMsdHjJDXXN2HBggaUVcHBAW c1iiVrluZDgo19IIwLtDUjJReFaoo1/K+uuRftJv5nlr72T+XONyEdgzjTy9VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=376a027be75d1f39a05f18ce4a766b585305ba44 commit 376a027be75d1f39a05f18ce4a766b585305ba44 Author: Ganael LAPLANCHE AuthorDate: 2022-07-17 10:41:45 +0000 Commit: Ganael LAPLANCHE 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