From nobody Mon Feb 21 20:38:18 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 2C53019D96B7; Mon, 21 Feb 2022 20:38:19 +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 4K2YzH0kLmz3vHJ; Mon, 21 Feb 2022 20:38:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645475899; 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=6zl0NfprugJ/fMxXK3EV4Sd7qN6Dxu5NHWyH6fEYBH8=; b=IQdFpcdtaxXET3pXox5wztOoCEGhXKQW1wmebfDRLX9xqgTysPWInWV7G0G9mTKYXz/NPu z2MhjvX/zFKMkqx2oZL7mDXNAQ8yQXWfzDGtTuYwI6Vst3xt8BUnLT0RluSW1ANEUXbZmM z2ejEtSlAWA7rwSygcE7cX/uM5v6v2McNbPJK4+cdscKWsmWPEILrdLPa0gYq97/0+8HVR IWqMtj1V10tRX2FO9jBC16/aO6VLwZXk2K0t1lYqdmS2uPLsJZVaJPGd+JYk8gYsnULuMb mBcT9cUcIX6JM+kT22Sb+LoIdYloQaNYS/0l6ani1UtOKFK88pt/LQWb33MEVA== 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 EE1AC16975; Mon, 21 Feb 2022 20:38:18 +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 21LKcIjl045286; Mon, 21 Feb 2022 20:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21LKcI4g045285; Mon, 21 Feb 2022 20:38:18 GMT (envelope-from git) Date: Mon, 21 Feb 2022 20:38:18 GMT Message-Id: <202202212038.21LKcI4g045285@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 853fc90fc363 - 2022Q1 - graphics/librsvg2-rust: fix build on powerpc64le and powerpc 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 853fc90fc363cf3f2d59694b25aee9abf65c6f37 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645475899; 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=6zl0NfprugJ/fMxXK3EV4Sd7qN6Dxu5NHWyH6fEYBH8=; b=Nay6KhT9THa0Bu7vgNC2BnJKP2yfy9R/TQdpGsSW+58ia6kHbnBP0IwohMjCRaWQpQYCsR tA90JVCFzsfGCEoeDsMaiXPxWZ3MbakEMJ5Uyrh0Pmaizd7J0wI/CdtC/cFi7BakNimwVY 8Uur0Egbalk2hh/oIO6PGDBkDQA7zP5T3ng4BjOCWpZ7uX5M5GgLzszEtNyN5KpBOqbLMw 0NALm1Djs0eC7I1aaMddyJ0c8exUrKj3wbzLnJRnjya17JezADdTv3DbQx3uMeIeTjD0CX sd2sNgAj0BEGyXxHU9k6bH74sXAKrAeIaC27MwmW5hdNUZpwlTUG1+53eRHXIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645475899; a=rsa-sha256; cv=none; b=gRx82gTMd501b/vmt/A5qG8ASvv5I5D38amuNsvB83BBgXVieHvIu+BQ06nlYN1cGsVc+3 dh5/INqfxOlBJSl/w/sj/hZSP2L1/l3JtqgKn5ZUlfCiuzvD+d8d//9B2sSvSxhHMkKxEc Gmj/mjcZQWgf5SAx9rUC/tmzSoc5MYWtIlJD9haSpPipYEuwhsSIJ2vDKpsb0zFiFJh1ri By0GKyIVAVt48MIWV00XQfXf/3YwkOn9tXVu2uUIiG+klvADzsJTeHS1A9FkCOto9Gcjei g6+MtfRdpZsFkXDLHbNVFK87w2xwWSxWsO67LIVMeA6miYhKjWzCgnK5EYQ9aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=853fc90fc363cf3f2d59694b25aee9abf65c6f37 commit 853fc90fc363cf3f2d59694b25aee9abf65c6f37 Author: Piotr Kubaj AuthorDate: 2022-01-05 19:04:58 +0000 Commit: Jan Beich CommitDate: 2022-02-21 20:37:16 +0000 graphics/librsvg2-rust: fix build on powerpc64le and powerpc 1. There are now two copies of cfg_expr used, both need to be patched. 2. For some reason, when powerpc64le block in cfg_expr 0.9 was lower than it is currently, the target failed to be identified as supported. (cherry picked from commit 51cc50759b234fe474a8c64ca96633a2b9128e03) --- ...h-vendor_cfg-expr-0.8.1_src_targets_builtins.rs | 38 ++++++++++++++++++++++ .../patch-vendor_cfg-expr_src_targets_builtins.rs | 4 +-- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs new file mode 100644 index 000000000000..69260e376741 --- /dev/null +++ b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr-0.8.1_src_targets_builtins.rs @@ -0,0 +1,38 @@ +https://github.com/EmbarkStudios/cfg-expr/commit/f8c59a8dccd0 + +--- vendor/cfg-expr-0.8.1/src/targets/builtins.rs.orig 2021-09-16 01:15:26 UTC ++++ vendor/cfg-expr-0.8.1/src/targets/builtins.rs +@@ -894,6 +894,16 @@ pub const ALL_BUILTINS: &[TargetInfo<'static>] = &[ + endian: Endian::little, + }, + TargetInfo { ++ triple: "powerpc-unknown-freebsd", ++ os: Some(Os::freebsd), ++ arch: Arch::powerpc, ++ env: None, ++ vendor: Some(Vendor::unknown), ++ family: Some(Family::unix), ++ pointer_width: 32, ++ endian: Endian::big, ++ }, ++ TargetInfo { + triple: "powerpc-unknown-linux-gnu", + os: Some(Os::linux), + arch: Arch::powerpc, +@@ -1002,6 +1012,16 @@ pub const ALL_BUILTINS: &[TargetInfo<'static>] = &[ + family: Some(Family::unix), + pointer_width: 64, + endian: Endian::big, ++ }, ++ TargetInfo { ++ triple: "powerpc64le-unknown-freebsd", ++ os: Some(Os::freebsd), ++ arch: Arch::powerpc64, ++ env: None, ++ vendor: Some(Vendor::unknown), ++ family: Some(Family::unix), ++ pointer_width: 64, ++ endian: Endian::little, + }, + TargetInfo { + triple: "powerpc64le-unknown-linux-gnu", diff --git a/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs index 2a7fbc137cf0..b0da8fced087 100644 --- a/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs +++ b/graphics/librsvg2-rust/files/patch-vendor_cfg-expr_src_targets_builtins.rs @@ -19,7 +19,7 @@ https://github.com/EmbarkStudios/cfg-expr/commit/f8c59a8dccd0 triple: Triple::new_const("powerpc-unknown-linux-gnu"), os: Some(Os::linux), arch: Arch::powerpc, -@@ -1002,6 +1012,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ +@@ -992,6 +1002,16 @@ pub const ALL_BUILTINS: &[TargetInfo] = &[ family: Some(Family::unix), pointer_width: 64, endian: Endian::big, @@ -35,4 +35,4 @@ https://github.com/EmbarkStudios/cfg-expr/commit/f8c59a8dccd0 + endian: Endian::little, }, TargetInfo { - triple: Triple::new_const("powerpc64-unknown-linux-musl"), + triple: Triple::new_const("powerpc64-unknown-linux-gnu"),