From nobody Wed Apr 02 14:31:13 2025 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 4ZSS3P4gKRz5sMSn; Wed, 02 Apr 2025 14:31:13 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZSS3P3M7Fz3YL4; Wed, 02 Apr 2025 14:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743604273; 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=+2qMpVZpzk7xMItjoGbSY+uJcEkEgn27HkvVaVaalSk=; b=l4qTTkEh/bqO5rHIzTpaL3Xe3ZeHXqoEUoL73uUfO4UAe37WawkDgvzhazN1kEyS7Lgkct jMxiErdSYC/7w4+b/kZNX91UQb78FBDPiJT43b0vKh60Mom9ZqZc/L/QpCA/N3rBQAh9TB SVI9yKSsTY3DFD8jIcy0nV81FtLKJplKny36CdshWJn/o96C19qrdPbj95oQ8fwAJ3ZEgP gP9pA56zQgzJPhlaUpLBSGGdt7uUj+zN8sx8OCkZCJfle5XEZHAGfE7J8VLJ96nfX6tV+T ws073y/iP6bPF5FDpIZcRN2WEE7Gez4axQqQf3fpmc1cZ0xJjqjUt7ewH5PHHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743604273; a=rsa-sha256; cv=none; b=iG/ad76yMm50+19be2fYg0oCfa74qte3s4HKB81uR6mNRvp0LCPYC+E6NeDRy+CWfZcLNV Ke5yTK+IMKXE1CSZmeEtL8NO8Xh2q7o/8H9lqs/jtMwQVqpmRYM3S3XaaTSv+7W+hN4jYP HN/D2r2G4NoUJpZy0rNXmlErs1L2/HIHkkUWHapWeEDNUd2BbLl+xKKD/BJi63vc3+rMp/ eJU0dGxXwCVDFh5eZE54eT7ui42wLAEY6gi/O3EgVqOc5q2hXxMpw6U8q7HFeJjYEd03N+ YDvcgcLegsMd7AHqL4osL7wQ4O+mY9Zm7NCcUvKUsGfu59JNTsIPFPX29Av1VQ== 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=1743604273; 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=+2qMpVZpzk7xMItjoGbSY+uJcEkEgn27HkvVaVaalSk=; b=lBvuR8LRQRrTGaoFUPxhmjWy0uGgTJ9VkG00w6SF0fcM0uuo+XR97U1Ke4cXpULVVGULEH mepITeBOt/SHVJPvPNBnceJ4KfOjoNLw8YnsJehGf+l1QF38vMoOixG+m4rcNFA3eO5iFz ItN90HW4DPd4UGj724Xk/vQDhJ/gdUugAxbf8csL0Awy7mh7Rkrb1YCb478Am5OCzaJXKM 7XYiTSX90Y37Khek1at1svI3P/AbWSumOPOW/TUdA/bqfydPU0il8ZhKNAxqO0J9AKsJ4B 5RV30aWYrMVzcD6N6RAGzY3x8Jv5Vl6eo7KXSoKfPKPTI8py7aMgj+hb+Rs+nw== 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 4ZSS3P2gjqz4Zq; Wed, 02 Apr 2025 14:31:13 +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 532EVDb2078463; Wed, 2 Apr 2025 14:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 532EVD6E078460; Wed, 2 Apr 2025 14:31:13 GMT (envelope-from git) Date: Wed, 2 Apr 2025 14:31:13 GMT Message-Id: <202504021431.532EVD6E078460@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 35831f537cc0 - main - x11-wm/hyprland: unbreak build on -CURRENT after 21724f4bf92e 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35831f537cc00960c1b832dc58bea8a7c1dbb5d0 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=35831f537cc00960c1b832dc58bea8a7c1dbb5d0 commit 35831f537cc00960c1b832dc58bea8a7c1dbb5d0 Author: Jan Beich AuthorDate: 2025-04-02 14:01:40 +0000 Commit: Jan Beich CommitDate: 2025-04-02 14:29:22 +0000 x11-wm/hyprland: unbreak build on -CURRENT after 21724f4bf92e Assertion failed: (!Current->LocalDecls.contains(D) && "Instantiated local in inner and outer scopes"), function InstantiatedLocal, file /usr/local/poudriere/jails/main-i386/usr/src/contrib/llvm-project/clang/lib/Sema/SemaTemplateInstantiate.cpp, line 4418. PLEASE submit a bug report to https://bugs.freebsd.org/submit/ and include the crash backtrace, preprocessed source, and associated run script. Stack dump: 0. Program arguments: /usr/bin/c++ -DAQUAMARINE_VERSION=\"0.8.0\" -DAQUAMARINE_VERSION_MAJOR=0 -DAQUAMARINE_VERSION_MINOR=8 -DAQUAMARINE_VERSION_PATCH=0 -DHAS_EXECINFO -DHYPRCURSOR_VERSION=\"0.1.12\" -DHYPRGRAPHICS_VERSION=\"0.1.2\" -DHYPRLAND_VERSION=\"0.48.1\" -DHYPRLANG_VERSION=\"0.6.0\" -DHYPRUTILS_VERSION=\"0.5.2\" -Dhyprpm_EXPORTS -I/wrkdirs/usr/ports/x11-wm/hyprland/work/Hyprland-0.48.1/subprojects/udis86 -I/wrkdirs/usr/ports/x11-wm/hyprland/work/Hyprland-0.48.1/. -I/wrkdirs/usr/ports/x11-wm/hyprland/work/Hyprland-0.48.1/src -I/wrkdirs/usr/ports/x11-wm/hyprland/work/Hyprland-0.48.1/protocols -isystem /usr/local/include -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -fno-strict-aliasing -DNDEBUG -std=gnu++23 -O3 -Wall -Wextra -Wno-unused-parameter -Wno-unused-value -Wno-missing-field-initializers -Wno-narrowing -Wno-pointer-arith -fmacro-prefix-map=/wrkdirs/usr/ports/x11-wm/hyprland/work/Hyprland-0.48.1/= -DTOML_HEADER_ONLY=0 -DTOML_SHARED_LIB=1 -Wno-missing-braces -MD -MT hyprpm/CMakeFiles/hyprpm.dir/src/core/PluginManager.cpp.o -MF hyprpm/CMakeFiles/hyprpm.dir/src/core/PluginManager.cpp.o.d -o hyprpm/CMakeFiles/hyprpm.dir/src/core/PluginManager.cpp.o -c /wrkdirs/usr/ports/x11-wm/hyprland/work/Hyprland-0.48.1/hyprpm/src/core/PluginManager.cpp 1. /usr/local/include/glaze/reflection/get_name.hpp:65:69: current parser token ';' 2. /usr/local/include/glaze/reflection/get_name.hpp:21:1: parsing namespace 'glz' 3. /usr/local/include/glaze/reflection/get_name.hpp:63:4: parsing struct/union/class body 'glz::detail::reflect_field' 4. /usr/local/include/glaze/reflection/get_name.hpp:48:31: instantiating variable definition 'glz::detail::get_name_impl<0, glz::detail::GLAZE_REFLECTOR>' 5. /usr/local/include/glaze/reflection/to_tuple.hpp:1278:22: instantiating function definition 'glz::detail::get_ptr<0U, const glz::detail::GLAZE_REFLECTOR &>' [...] Reported by: pkg-fallout --- x11-wm/hyprland/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 836bec061d1d..a50b418d067a 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -100,5 +100,11 @@ update-hash: .include +# XXX COMPILER_TYPE is defined after USES was already parsed +.if "${CHOSEN_COMPILER_TYPE}-${_OSRELEASE:C/.*-//}" == "clang-CURRENT" +llvm_ARGS= build +.include "${USESDIR}/llvm.mk" +.endif + # XXX Work around !target(makesum) makesum: update-hash