From nobody Sun Dec 18 17:43:51 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 4NZqvW5Pm7z1Gm0h; Sun, 18 Dec 2022 17:43:51 +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 4NZqvW2JKYz4JRx; Sun, 18 Dec 2022 17:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385431; 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=yJDpP80jcpM6KBzUxEOAUkcb24TG/Tk+x1/jE8nS6GM=; b=MHx1d4uHC+lTNNGGfYZvc2XXBGd9RRV8rKRJMbe0ciYcS/et7Epandsu2I4+xjNI281+1f QJcIyGO8zT5SoT68O5KLS5EKSEimGc7Nq7gv+jWeQxIECuyygVQoI3bSXI/luXhLEXarR5 eXk+4cU42NWTAowS7N0Wr5Ivy6UIthxlUIONj1mdxkfjk+nawq0p24+aJXzFM3St2d9tfh SJqtGrzRCg11WtMWO2fYQp/qai1jxD79GDazFc+2SmT5OA9x5DEi5o8yZbEh2XzL1IVrSm c/kVSMkcFrxNCpJq1lMbiALsmgleEG2EFlA62Vr2QWzLVFMWmSbkHlFlXXRF+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671385431; 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=yJDpP80jcpM6KBzUxEOAUkcb24TG/Tk+x1/jE8nS6GM=; b=Ple73aMWVr+5aaYSP9R7CvLjGHJr2YSXhY3ISnWeuKLRE875f6+qmL/mazJsHh+K7AU34d oQdJ1M+o/TnrfYjEI2ixao5nq2Y03hl07payTcTmI9TbAZNOVteieRfIO0THbju+JgW41P gEtrRirY4a3ft+Wb/TnGoDAyGqy+z/xS6L8Ra5aG43TcURZbksizQpcTPGS55dyrKGIAE+ PQ03kn0nqGIti4ZsxfIBKje12X5EXbBd57LGMOk9sfh9CzA8Ni4SjowSYhvdrSOvNZlRCr CQ6CWD5ReRad+NJDIuPlpWkIILZhoaJt2bps/6S0mZr7z0M147b7jIBnbFXTHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671385431; a=rsa-sha256; cv=none; b=etUqApENrMCZ5zh1i4+5oU1FpdvAw2dgU+FX1DCzpBrhSJkw4pqT8u5peVp4phW97ma9X2 AJpWWJNeV/VwmN7tp6mtbag7Cr1PNdPUFbRg5jBguhRdTq6JIqiWCSq6YK48Hphu0Q03ql FOc8HH5zMHdtnxW72HK9Fpoh0sLHB2xT2ibntaWigF9EdnFHRCjpSHUv3MnfkaewVIP1tM k3KfqwxQ/mPn+gnuaXJ64ytu/zGIehCQYHQZ+OwIOKxfZ56RmrzuuhwN1ZOwvRay/GPv1K 3Rnxf4ebtbKbeOQaSLGn9WBhdPeIvWCxdFDQTK7LetA2lzXL8AOaB4krVamoOQ== 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 4NZqvW1JFJzPwd; Sun, 18 Dec 2022 17:43:51 +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 2BIHhpYP006471; Sun, 18 Dec 2022 17:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BIHhp7q006470; Sun, 18 Dec 2022 17:43:51 GMT (envelope-from git) Date: Sun, 18 Dec 2022 17:43:51 GMT Message-Id: <202212181743.2BIHhp7q006470@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 9f8385f9876a - main - lang/gjs: fix build with libc++ 15 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f8385f9876a46d8566cd655062c8ba24efac2f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=9f8385f9876a46d8566cd655062c8ba24efac2f5 commit 9f8385f9876a46d8566cd655062c8ba24efac2f5 Author: Dimitry Andric AuthorDate: 2022-12-12 13:49:23 +0000 Commit: Dimitry Andric CommitDate: 2022-12-18 17:34:13 +0000 lang/gjs: fix build with libc++ 15 During an exp-run for llvm 15 (see bug 265425), it turned out that lang/gjs failed to build with clang and libc++ 15: In file included from ../test/gjs-tests.cpp:11: In file included from /usr/include/c++/v1/random:1689: In file included from /usr/include/c++/v1/__random/discrete_distribution.h:18: In file included from /usr/include/c++/v1/numeric:167: In file included from /usr/include/c++/v1/functional:515: In file included from /usr/include/c++/v1/__functional/boyer_moore_searcher.h:24: In file included from /usr/include/c++/v1/array:127: In file included from /usr/include/c++/v1/algorithm:1851: In file included from /usr/include/c++/v1/__algorithm/ranges_sample.h:13: In file included from /usr/include/c++/v1/__algorithm/sample.h:18: /usr/include/c++/v1/__random/uniform_int_distribution.h:162:5: error: static assertion failed due to requirement '__libcpp_random_is_valid_inttype::value': IntType must be a supported integer type static_assert(__libcpp_random_is_valid_inttype<_IntType>::value, "IntType must be a supported integer type"); ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../test/gjs-tests.cpp:71:16: note: in instantiation of template class 'std::uniform_int_distribution' requested here return std::uniform_int_distribution(lowest_value)(gen); ^ ../test/gjs-tests.cpp:942:30: note: in instantiation of function template specialization 'Gjs::Test::get_random_number' requested here char32_t random_char32 = get_random_number(); ^ This is because std::uniform_int_distribution is only defined for strict integer types, such as short, int, etc. Use std::uniform_int_distribution instead, and cast the result back to a char32_t. PR: 268329 Approved by: portmgr (tcberner) MFH: 2022Q4 --- lang/gjs/files/patch-test_gjs-tests.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lang/gjs/files/patch-test_gjs-tests.cpp b/lang/gjs/files/patch-test_gjs-tests.cpp new file mode 100644 index 000000000000..e5287370143d --- /dev/null +++ b/lang/gjs/files/patch-test_gjs-tests.cpp @@ -0,0 +1,11 @@ +--- test/gjs-tests.cpp.orig 2022-08-08 05:05:12 UTC ++++ test/gjs-tests.cpp +@@ -939,7 +939,7 @@ static void gjstest_test_args_set_get_unset() { + assert_equal(arg.v_uint64, random_uint64); + assert_equal(gjs_arg_get(&arg), random_uint64); + +- char32_t random_char32 = get_random_number(); ++ char32_t random_char32 = static_cast(get_random_number()); + gjs_arg_set(&arg, random_char32); + assert_equal(static_cast(arg.v_uint32), random_char32); + assert_equal(gjs_arg_get(&arg), random_char32);