From nobody Tue Mar 14 19:05:03 2023 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 4PbjdX0d29z3ycL6; Tue, 14 Mar 2023 19:05:04 +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 4PbjdW5fn8z3P4p; Tue, 14 Mar 2023 19:05:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678820703; 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=/dEnAyMTt79E6HvTVRWsxbW0MaVCcFsgSFm5CRTtK9g=; b=ylG2yGsF/X40ok1BgV5Ro+9Sxq/PLhGX+FlZgt/GVH4IRN+gk9cPpSgK4pHA6tBLEsdKX+ 7vzGJEWYh3IvzkSCOyY3D5qhGQZSK+PHu/7kofJnROUGOXJ1JcSnzStvcRysCeY8J3wuox 5t7MmS5W2EOXkOBukPaf9347OpOdHm9zcsqVDQjRtQ1QYrQ3y1tmsB0Cvu7P4G3smDr3/z e4MEJIyxbtSA887OJSpoCL2i/d9LaW5ooIwf2H3LoXVnaGYbb9PI+AIIUG9OyevPw/OPoN BdstXSFbT/g0q85rCramN4F27kgCuFitgkXmCi0xuNRgmI8+ETPcO4q8SvsrrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678820703; 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=/dEnAyMTt79E6HvTVRWsxbW0MaVCcFsgSFm5CRTtK9g=; b=MYrOSlLPL9VoIy97wcvbl8hhkZJB23d+uOFxzmzb0zSlC8MAie1vsivneYlzmhSolwcuhh Gqmmz+eLtjCoCFTNL4egDW+YVMXb0Tdv4Z7n3rv03I4fA9kmOWE/x5WQCIrwUIw6NzTPeC 2dTDJa5w7AjO7x2BfdF3nkiSRuEMI39FCgMmn876BVI7nGj4JMfqTS8a4M/83qTVpfN3+8 rDhp2DcGMViQbqx4vuAvR2/UVUfxqIV3DjdNLpG7O5OxEIrP/gzAqNy1XwfcB7gquWLUuK 8srd52QoldrCWvhd/bqkqFgGpI8IWARXfsXTHwZ0FM6n8q8j5ojaF3u9WGJv2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678820703; a=rsa-sha256; cv=none; b=RQFCdAW+yVu7Odm6+dSR3Koxho57Etbeg3SlHE6ys8hjxcxiOJNOCE1fgtqwIKsvBlLL4b qaDrWZTRR+9YbCdgxcEoRsn4LGfRXGXDRKeLUtvKjrzCxa2AH0JZaQ9tzoOizKUhXEetUM QINFP44su2y1IQtkIy1pkAYhY4WegcjsJucDMEw5DMTenuofCjxnV7i+watitcJR/39jEX OfJOKYwFMSsBPVQge7CKw81Io9eweeBJfb9QufmpIQOVvBvwetmFEDSJ5L4H7CF65U/1tW TgXsfuTZ4DyGVjX4019yW8bk8+M2iDylQ28GiOPArs4RD3QzS08WhHa+JLQsVQ== 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 4PbjdW4LRNzmr7; Tue, 14 Mar 2023 19:05:03 +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 32EJ53wO022116; Tue, 14 Mar 2023 19:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32EJ53Wi022115; Tue, 14 Mar 2023 19:05:03 GMT (envelope-from git) Date: Tue, 14 Mar 2023 19:05:03 GMT Message-Id: <202303141905.32EJ53Wi022115@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: 50e80b4f157f - main - devel/desed: fix build on powerpc by merging upstream kqueue commit 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50e80b4f157f3f34b1bc6262480cb563a52fdff7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=50e80b4f157f3f34b1bc6262480cb563a52fdff7 commit 50e80b4f157f3f34b1bc6262480cb563a52fdff7 Author: Piotr Kubaj AuthorDate: 2023-03-14 19:04:25 +0000 Commit: Piotr Kubaj CommitDate: 2023-03-14 19:04:25 +0000 devel/desed: fix build on powerpc by merging upstream kqueue commit --- .../patch-cargo-crates_kqueue-1.0.6_src_time.rs | 42 ++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/devel/desed/files/patch-cargo-crates_kqueue-1.0.6_src_time.rs b/devel/desed/files/patch-cargo-crates_kqueue-1.0.6_src_time.rs new file mode 100644 index 000000000000..57d3f86795e6 --- /dev/null +++ b/devel/desed/files/patch-cargo-crates_kqueue-1.0.6_src_time.rs @@ -0,0 +1,42 @@ +--- cargo-crates/kqueue-1.0.6/src/time.rs.orig 1973-11-29 21:33:09 UTC ++++ cargo-crates/kqueue-1.0.6/src/time.rs +@@ -1,32 +1,14 @@ +-use libc::timespec; ++use libc::{c_long, time_t, timespec}; + use std::time::Duration; + +-#[cfg(not(all( +- any(target_os = "freebsd", target_os = "macos"), +- any(target_arch = "x86", target_arch = "powerpc") +-)))] +-pub(crate) fn duration_to_timespec(d: Duration) -> timespec { +- let tv_sec = d.as_secs() as i64; +- let tv_nsec = d.subsec_nanos() as i64; ++#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] ++type NSec = i64; ++#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] ++type NSec = c_long; + +- if tv_sec.is_negative() { +- panic!("Duration seconds is negative"); +- } +- +- if tv_nsec.is_negative() { +- panic!("Duration nsecs is negative"); +- } +- +- timespec { tv_sec, tv_nsec } +-} +- +-#[cfg(all( +- any(target_os = "freebsd", target_os = "macos"), +- any(target_arch = "x86", target_arch = "powerpc") +-))] + pub(crate) fn duration_to_timespec(d: Duration) -> timespec { +- let tv_sec = d.as_secs() as i32; +- let tv_nsec = d.subsec_nanos() as i32; ++ let tv_sec = d.as_secs() as time_t; ++ let tv_nsec = d.subsec_nanos() as NSec; + + if tv_sec.is_negative() { + panic!("Duration seconds is negative");