From nobody Wed Jul 3 12:13:11 2024 X-Original-To: dev-commits-ports-all@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 4WDdw81RWHz5P797; Wed, 03 Jul 2024 12:13:12 +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 4WDdw80lrdz4gZt; Wed, 3 Jul 2024 12:13:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720008792; 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=88qLMFlmaiK9bU5l8KKjHQhgcv/gxWTT1u9liUXDZCE=; b=sh/3QjbY6lS9ZrMAY5eF5ggDMtlonFCpJpLF5GPGC4+sYLdXxILugn6YP1L3vB5avEOt5w O0s8o+90voeW0yJiI6uwgStZVmjxPu2pTFPc1iXqh2TdsIYVjaXW2P7MOuYn4LYlQ25X1C QoQJbgtrLbbbM71wEuoNq32XFdruF3lNwxYEaoOFGUb+2iy4DwAPOco/hL73SMUvBCTxG3 9HQ04b0zQV+IJ4M8c/L/EzzsSjbCj4Uyni3zhhjNQnXwb1TpdYZmf67sx3rdVUlW7U1scW MCsqQ2tLv9cvZ/e+icusnqsDqvdwOII7Y+iAXl+7QDVU/K2N+SK1RdmlAAdMtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720008792; a=rsa-sha256; cv=none; b=I90P3uEdfpT7zGPfM4BrOcNHMJi8P/stmE8Z5R2HEhmGsY5aKrdObZ9wN9flfXwNEqW/Nd O20eadSMLR5aB9NfFE9sMUqpmeC7yuL3vQINnYNyHWtC8LnSW1bI33VL5g8K70YQ8CJrj/ 5awR/wOQXvZFy7GqwffS5ZIe0EfnzKjLv43Gvf1gHB41Tgax9uuLXVcAcn4OaJpgKmQPK2 ykqUwCUeqf9YYjPegU/RFvtni12kFy1ZEFGAl1T+RsgoiNc4zNrSJxht6RH2xoBb4n9cmX qbt6dRhNYJ5MQ7EhqjYjx3nKFwXvSgz3Qk3Ztrx0QuqCGyMub9VAHSWvsqvBHg== 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=1720008792; 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=88qLMFlmaiK9bU5l8KKjHQhgcv/gxWTT1u9liUXDZCE=; b=Cxw58j+cF1GCmtWkg5wk6GXWa7joO2u7GaXeF5+FOB0KhkQ2MQvZ4cUmn//fOAmGT+6I4J pfbKSkk6kIzCNykailysdVClF9q0oBZyaPXklsMlzqE0jqJwSpJcbKCDYzhzU2hzLRkFVn Ym2YfknEjlCbAR9OF/E8s7j9NcplakMRlH7nPuJQKuseagUV7zq1Zzty7FpLvhGwxsxpSt P8+qUsYMTyBP5DulABcltGBm5uJ+hSSUU39WnNEU1K7PskyVwfsMm/3jKyvS1mQBNzffc0 oZhvlo5hiHy7BxN8Uet8ToYEurGjpRSrahRRwpPzK3Jrn3jlo89X0y7gzGEoIQ== 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 4WDdw80M95zX0c; Wed, 3 Jul 2024 12:13:12 +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 463CDBp0036561; Wed, 3 Jul 2024 12:13:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 463CDBmO036558; Wed, 3 Jul 2024 12:13:11 GMT (envelope-from git) Date: Wed, 3 Jul 2024 12:13:11 GMT Message-Id: <202407031213.463CDBmO036558@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: b65e6c38fd05 - main - emulators/wine: Firmly depend on LLVM 15 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: b65e6c38fd055e913a4ce458d5c774c715a5ea9b Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=b65e6c38fd055e913a4ce458d5c774c715a5ea9b commit b65e6c38fd055e913a4ce458d5c774c715a5ea9b Author: Gerald Pfeifer AuthorDate: 2024-07-03 12:08:37 +0000 Commit: Gerald Pfeifer CommitDate: 2024-07-03 12:09:54 +0000 emulators/wine: Firmly depend on LLVM 15 Our devel/llvm18 and devel/llvm17 ports (with commits c56fde6514 and b21e6b4de1, respectively) now provide C99 include files.[1] This is a positive and fixes a long standing issue. It significantly changes what Wine builds, though. For emulators/wine-devel we moved to the new world order already; for emulators/wine remain a bit more conservative and stay with status quo ante by firmly using LLVM 15. For most users this won't make any difference since so far we have been using LLVM_DEFAULT which currently stands at ... 15. On the way use the new USES=llvm facility instead of doing things more manually. PR: 279677, 274542 [1] --- emulators/wine/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index d3634d60a802..af0135ab95e2 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -15,9 +15,10 @@ 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 \ +USES= bison cpe desktop-file-utils gmake \ + llvm:15,build,noexport localbase \ pkgconfig sdl shebangfix tar:xz USE_GCC= yes USE_SDL= sdl2 @@ -60,8 +61,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 @@ -125,12 +126,6 @@ CONFIGURE_ARGS+= --without-gstreamer PLIST_SUB+= GSTREAMER="@comment " .endif -.if ${LLVM_DEFAULT} == 11 -_LLVM_VERSION= 15 -.else -_LLVM_VERSION= ${LLVM_DEFAULT} -.endif - .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port on FreeBSD/i386) is the 32-bit component