From nobody Wed Jul 31 08:13:33 2024 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 4WYlGj3XfMz5RRtN; Wed, 31 Jul 2024 08:13:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WYlGj30Sbz3xHx; Wed, 31 Jul 2024 08:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722413613; 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=wSMsedBukm318BBNY8X0zYQBV7NfHW5JMLHZU0Glkso=; b=k7EyciLLPtvjNppyuu6KhPUp3/NkIUUwC0QL6+ugICUckeNVIvaFlFx1i16PV/2TXIbfY7 4qQmOMwZb+D8wy3q6WzTs0yokbDAOFM7AdHQVi43RYk93ttqcsn365C6qeUOY85DnzF6tJ 734wr3aie+BMOWg6dqBwGhcB0oIFsCHdypn58z5sVvPRXLjsv/yPVOKMPsKWa92zahfZIE tNYbDhqbU6TITD42Sj0KFshukc708mai+ACZsfJafhIYvHI3D4OguxwH4depLRWRYDZh/F c33tpHUA60oBFhuOEEl/EIq3lhl6tJ1O6P91avpj5rW7K68ZdE/XIJZL5/QVUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1722413613; a=rsa-sha256; cv=none; b=Y4hjrNihSvsWNWxTZcxYebm/aUAb9+NUYEJX35qHaY3hdXUuLYCnQU8Bn1xKoKRq/EZugX nGNwat+droRCVeOnmoRSp22GRTtuUQo8Fv3u6l6NQqiLSawpClzACRQt8OOpuuFV3cuH6B 6byC9PRQA6A7HlYZYvbmIeirGplyB3kR98ruCr9l872eTzgafvYR8VJWAWDkqbWKey6F3s LaBl3Ex4VyUZzBWYVVB55vssoeJ+nb+UOXQFI8iyqn2p4imGy0ftdon0iLuZ79FrNMZ5sR wT0B7tGnlfY1uD02unF5ajTOHEnSfAmJfx8svnD/KfDGsOX2amoOtM1OZ5bzcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1722413613; 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=wSMsedBukm318BBNY8X0zYQBV7NfHW5JMLHZU0Glkso=; b=p4IIu3jiUeE1GZDRhiJ1ykNg9iyOTAGFh1FJjRYpAqUvE58PPzz3YL46qsqV1hdq1Gn/hM eAOj+hkLdd2n5XmVnizsGL8WKiCzRx+ExLaNmCrPEUc3DsF7FhzdYg3IQ+UtYy4ZJItIXy +aFFa5+RgAc6HSpvSqHbLFFT/xDHbJZGXVi2OzEhggc2cH7C0FG+VVOJA4d3bV7XngROdM YubshML9846i9VP+mC8eN6EDdj5FaaGOWWoTUywGCnBKjsL6RwB6IfhMcw69L3F9iMr4uB 4Gu5ZhFuhrGU6LHB5TEmJ3U8IyrckPWmHrhMMVK6GHLa7FFawn/tvMez3udaIg== 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 4WYlGj2YzCzswS; Wed, 31 Jul 2024 08:13:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46V8DXq0042487; Wed, 31 Jul 2024 08:13:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46V8DX0e042484; Wed, 31 Jul 2024 08:13:33 GMT (envelope-from git) Date: Wed, 31 Jul 2024 08:13:33 GMT Message-Id: <202407310813.46V8DX0e042484@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: cc181346de3f - main - emulators/wine-devel: Leverage USES=llvm 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cc181346de3f0e0477ef3e9a4dd6f002db5892c3 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=cc181346de3f0e0477ef3e9a4dd6f002db5892c3 commit cc181346de3f0e0477ef3e9a4dd6f002db5892c3 Author: Gerald Pfeifer AuthorDate: 2024-07-31 08:12:28 +0000 Commit: Gerald Pfeifer CommitDate: 2024-07-31 08:12:29 +0000 emulators/wine-devel: Leverage USES=llvm This allows simplifying BUILD_DEPENDS, use of variables, and the overall structure, plus it's aligned with emulators/wine now. --- emulators/wine-devel/Makefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index d9360095156d..133e24030133 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -15,9 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 -BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex llvm${_LLVM_VERSION}>=0:devel/llvm${_LLVM_VERSION} +BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex -USES= bison cpe desktop-file-utils gmake localbase \ +# Only devel/llvm17 and later come with necessary include files - PR274542 +USES= bison cpe desktop-file-utils gmake \ + llvm:17,build,noexport localbase \ pkgconfig sdl shebangfix tar:xz USE_GCC= yes USE_SDL= sdl2 @@ -61,8 +63,8 @@ USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ tools/winedump/function_grep.pl -BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${_LLVM_VERSION} \ - lld-link=${LOCALBASE}/bin/lld-link${_LLVM_VERSION} +BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ + lld-link=${LOCALBASE}/bin/lld-link${LLVM_VERSION} SUB_FILES= pkg-message @@ -124,11 +126,6 @@ CONFIGURE_ARGS+= --without-gstreamer PLIST_SUB+= GSTREAMER="@comment " .endif -# Only devel/llvm17 and later come with necessary include files - PR274542 -.if ${LLVM_DEFAULT} < 17 -_LLVM_VERSION= 17 -.endif - .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port on FreeBSD/i386) is the 32-bit component