From nobody Tue Dec 19 13:23:16 2023 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 4Svcnx0CD9z54Dcl; Tue, 19 Dec 2023 13:23:17 +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 4Svcnw51Wlz4Syr; Tue, 19 Dec 2023 13:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702992196; 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=t2c/t9GucbcmM9JophvnC0LQwJnvt3IgYWhnKJh+5dU=; b=u3r+IFXWiRyxd/FXkaaGgUwxiGL8TM2yIk7Mzpt/KINDwgJ7BovaqAzXLdbY/flsx++hs3 q4eWC4MIOOFn3Lizr08XYoDaNNQ3ytYUDus6ZgFmA5qG6WdPAJ6ONlzKNLqBp8Ebhw6mDl t5lQsamRzkdo2cbxoWSdzuFV67+VobSw9Ahu1wm/41GU4okMpwb8j8Oy2sNJnA8O9kR1l2 YnDpn3P0oM8pmx3NGlswCjytG/7U0Oa7RMfZ2oLuTxFv9M5ycz71R1omzje9SbQFJaBNka n3gbFVfHPiSj4S92lnf/5tqVsTxWh87sc9Q5oN9tql+OwgcJyQoYDJN9uSLtfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702992196; a=rsa-sha256; cv=none; b=D+AJEs6Gf6VKsuemyg/lNvRrJiNsxfYJB9TRwmA7bwRygosl7fAFMWFVp+Jw9tb3GN0Ol/ TAzkWDalDbLtKhRWA9GO24c+sdIATNtiA45zRLwAd5PEh41U3PfaLyxjZ4z6defIRC+Znv JqV7RreYur5hLkYxH8PlGU7WeG7f/wmJdagjtv95Z7eeuS6y/NEyU/ZEhfEN4uDYGAfLGg wcaisO9Xr6atxY1q1bg9bOFSeK5wF9d/67wOzQzRULnXoOiXsnJ3pGAzuUEjzDw3m9L6ba Q8dpKCUXhf+bQUa03czDEmbIPqeKp5xbdLf3A7CAxzcuxCx/rVyeFL2IbbBAvw== 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=1702992196; 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=t2c/t9GucbcmM9JophvnC0LQwJnvt3IgYWhnKJh+5dU=; b=XEeV+Y1KgYpSTia1PMEG6cXLUgKP6G9Efd90YQNmJ2V8UfI5KKSsuESpdnnlBTI6xz4O0T YNE+pXtJyOqwyOTDHYY0ebcoGClNidHMuwQhL2LPDo8HZ9AFM7p+pzl1JcB33E1Pg2R39e Z0GSMH7yPMZy/cCCSgjJMQlkTCTkpTq0gxwPZqnZwjGHZlSMWTqWcZknL5LyIVjkYYG6eb 6zBIYDTjl4rE6Q7pKlD14repB99AFUdkNgoIBtTbAQZXTQrY4v7XbPD9vYRpSaW3rBm98e wpTwXlb9mq9PRgAJrfbUZMjjtw5jpsdU5VGpEZp5pKTN4lhT1uWbNe0TmFoFww== 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 4Svcnw46hdz162Z; Tue, 19 Dec 2023 13:23:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BJDNGB2014206; Tue, 19 Dec 2023 13:23:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BJDNGKD014203; Tue, 19 Dec 2023 13:23:16 GMT (envelope-from git) Date: Tue, 19 Dec 2023 13:23:16 GMT Message-Id: <202312191323.3BJDNGKD014203@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: 5d35e5882352 - main - x11/waybar: unbreak build with libc++ 17 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 5d35e5882352f2cd7f6e86748d35bfab3aeb7952 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5d35e5882352f2cd7f6e86748d35bfab3aeb7952 commit 5d35e5882352f2cd7f6e86748d35bfab3aeb7952 Author: Jan Beich AuthorDate: 2023-12-19 12:36:20 +0000 Commit: Jan Beich CommitDate: 2023-12-19 13:22:47 +0000 x11/waybar: unbreak build with libc++ 17 In file included from ../src/modules/clock.cpp:1: In file included from ../include/modules/clock.hpp:4: In file included from ../include/util/date.hpp:29: /usr/local/include/date/tz.h:235:8: error: use of overloaded operator '<<' is ambiguous (with operand types 'basic_ostream>' and 'const sys_seconds' (aka 'const time_point>>')) PR: 275651 Reported by: pkg-fallout --- x11/waybar/Makefile | 21 +++++++++++++++++++++ x11/waybar/distinfo | 2 ++ 2 files changed, 23 insertions(+) diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index 1f2c0870595b..15a8dc8eee49 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -160,4 +160,25 @@ pre-test: ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi +# XXX https://github.com/HowardHinnant/date/issues/799 +.if ${CXX} == c++ && exists(/usr/include/c++/v1/__chrono/concepts.h) +BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core +CONFIGURE_ENV+= CC="${CC}" CXX="${CXX}" CPP="${CPP}" +CMAKE_BIN= ${LOCALBASE}/bin/cmake + +# XXX Move into separate port and standardize via USES +GH_TUPLE+= llvm:llvm-project:llvmorg-16.0.1:libcxx +CXXFLAGS+= -nostdinc++ -isystem${WRKDIR}/libcxx_prefix/include/c++/v1 +# Don't link against new libc++ as it's not necessary +#LDFLAGS+= -nostdlib++ -L${WRKDIR}/libcxx_prefix/lib -l:libc++.a -lcxxrt + +pre-configure: bundled-libcxx +bundled-libcxx: + @${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \ + -DLIBCXX_INCLUDE_BENCHMARKS:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=${WRKDIR}/libcxx_prefix \ + -B ${WRKDIR}/libcxx_build -S ${WRKSRC_libcxx}/libcxx + @${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build +.endif # exists(/usr/include/c++/v1/__chrono/concepts.h) + .include diff --git a/x11/waybar/distinfo b/x11/waybar/distinfo index c87c0942e262..2eef355233ac 100644 --- a/x11/waybar/distinfo +++ b/x11/waybar/distinfo @@ -1,3 +1,5 @@ TIMESTAMP = 1699016827 SHA256 (Alexays-Waybar-0.9.24_GH0.tar.gz) = 57aa7860bc066ebf4f3327dafa9841100b098c0dec1dce4baaa1fae63e9b57ae SIZE (Alexays-Waybar-0.9.24_GH0.tar.gz) = 275416 +SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf35797002b1d2e40bb35a10c65605e0ea1435271 +SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803