From nobody Thu Jun 16 15:57:02 2022 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 24FB383C34A; Thu, 16 Jun 2022 15:57:03 +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 4LP6Hg0P8yz4bDc; Thu, 16 Jun 2022 15:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655395023; 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=nFI+2+yxSnnAgo4P2lc5Jp+eg8Jiw4d2XFSDzmJJwg8=; b=ut4/N5qV+SqWSZz1r3SqdmxS3HASwVOWw0sTsFvOWk5EU1lej+hV5ea7GVdacfPsbOtk9B WKj/xMAHASUTjG7hbrH4kQnQHrMObAag+6RH6xjXQX5QLuFomqsQ8UT4dEIBLvH+bnSrzr e+esxzFRb+p5QzW7VsMkVAd7jgtnyFDSwbG8+8xekiSvT4paUs5ezoPwUTpQYyw71CTOWS 4zlh2SOsubggxbtOQEXiswLDHHl5AiuF+P+W/HXKAVDNADgXQXpC2liap1z7GW8nJYA8uM DB/s0OuqVCQSaTx0x3qn3JtUOA3wUqIBH1IwJqoEfzylGGyBjeqwwJENxchMOA== 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 DD9496135; Thu, 16 Jun 2022 15:57:02 +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 25GFv2QC065720; Thu, 16 Jun 2022 15:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GFv2jw065719; Thu, 16 Jun 2022 15:57:02 GMT (envelope-from git) Date: Thu, 16 Jun 2022 15:57:02 GMT Message-Id: <202206161557.25GFv2jw065719@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 58ba468f234d - main - devel/bazel: properly add the abseil patch 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58ba468f234ddf4c807da14ed36e0359c39ba92e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655395023; 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=nFI+2+yxSnnAgo4P2lc5Jp+eg8Jiw4d2XFSDzmJJwg8=; b=oAZ7tu4YOHmFgz1X73NABf/KfcZHOr1Pt5ufAmaMEGzcnDsXZWsOqA3u4ozPNf2NNiik6j T5zNk6+jnUD+pZ9iSoMbTjkKat6ih+L3QE4UrfjTw3ebhB9VY1H4h54xqBdywK6Aq7PnY5 3qpTWl15wsNw8i8QZRD5oUQxrsDErg4NIesAxm85oTCwxqE6r2YiczKvnE3BGG7tts10oJ M7PJM2CjcXFNXCBM4reH5Zu0ZTNTej2Iesms1MGW15nx8UDHZ2wVCszmSl+iqrE1QrbZ4x oiC8Du+2WOwLz5AqFFBHwHFk9LKx5KdWN8Lvqk9kFJ2FTHyNM+a77iat9aPoFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655395023; a=rsa-sha256; cv=none; b=tV5YNfGpWuSAt6CRb9LfEAq+N+jqWHyL+2AujjFsBwYNH+vZfoDCQzfSl3W3ziwtfoJdkv vD8KLL+f8EkcRSw0roZ58rdnAqedRdX6pdD6Asp3OnEO8KdsRYmO1EPT3c49iQcQWAWg8n ds2Zfzg4wFvvLMSBarxJFRguUTDvNC0CVoqXTMzErbZJiEp9hP3rOowN4QTPLFpRxNEySm +KlkEa4WaNQ5psoUPbqL/Bwbxm7LOuThoN+E+2xmr4qWuhjyeNhWvi9QpS4Qw02tQ7Dwzh NXjMLjyYf/JgLyHNXc/TZt6CeW28gix0893seWt7TtDxzxVglfuxikpPy1RxkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=58ba468f234ddf4c807da14ed36e0359c39ba92e commit 58ba468f234ddf4c807da14ed36e0359c39ba92e Author: Piotr Kubaj AuthorDate: 2022-06-16 15:55:43 +0000 Commit: Piotr Kubaj CommitDate: 2022-06-16 15:56:40 +0000 devel/bazel: properly add the abseil patch In file included from external/com_google_absl/absl/base/internal/unscaledcycleclock.cc:27: /usr/include/sys/sysctl.h:1185:25: error: unknown type name 'u_int' int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); ^ external/com_google_absl/absl/base/internal/unscaledcycleclock.cc:95:10: error: unknown type name 'once_flag' static once_flag init_timebase_frequency_once; ^ external/com_google_absl/absl/base/internal/unscaledcycleclock.cc:97:18: error: no member named 'LowLevelCallOnce' in namespace 'absl::base_internal' base_internal::LowLevelCallOnce(&init_timebase_frequency_once, [&]() { ~~~~~~~~~~~~~~~^ 3 errors generated. --- devel/bazel/Makefile | 3 ++- devel/bazel/files/patch-distdir_deps.bzl | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/devel/bazel/Makefile b/devel/bazel/Makefile index 609e74343437..95ecf6cfbdf6 100644 --- a/devel/bazel/Makefile +++ b/devel/bazel/Makefile @@ -56,7 +56,8 @@ BAZEL_JAVAC_OPTS+= "-J-Xmx1g -J-Xms128m" pre-patch: @${CP} ${FILESDIR}/extra-patch-absl_base_internal_unscaledcycleclock.cc \ - ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \ + ${WRKSRC}/third_party/py/abseil/ + @${CP} ${FILESDIR}/extra-patch-bazel_grpc__deps.bzl \ ${FILESDIR}/extra-patch-bazel_build_defs.bzl \ ${WRKSRC}/third_party/grpc/ diff --git a/devel/bazel/files/patch-distdir_deps.bzl b/devel/bazel/files/patch-distdir_deps.bzl index 1a91f6c030a7..7585e5a1fe7b 100644 --- a/devel/bazel/files/patch-distdir_deps.bzl +++ b/devel/bazel/files/patch-distdir_deps.bzl @@ -1,10 +1,20 @@ ---- distdir_deps.bzl.orig 1980-01-01 00:00:00 UTC +--- distdir_deps.bzl.orig 1979-12-31 23:00:00 UTC +++ distdir_deps.bzl @@ -130,6 +130,7 @@ DIST_DEPS = { "patch_args": ["-p1"], "patches": [ "//third_party/grpc:grpc_1.41.0.patch", -+ "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl", ++ "//third_party/grpc:extra-patch-bazel_grpc__deps.bzl", "//third_party/grpc:grpc_1.41.0.win_arm64.patch", ], "used_in": [ +@@ -168,6 +169,9 @@ DIST_DEPS = { + "https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz", + ], ++ "patches": [ ++ "//third_party/py/abseil:extra-patch-absl_base_internal_unscaledcycleclock.cc", ++ ], + "used_in": [ + "additional_distfiles", + "test_WORKSPACE_files",