From nobody Wed Jan 05 19:07:08 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 165111922CD0; Wed, 5 Jan 2022 19:07:09 +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 4JTf9m5rm8z4X0R; Wed, 5 Jan 2022 19:07:08 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A51B911F14; Wed, 5 Jan 2022 19:07:08 +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 205J78lw031100; Wed, 5 Jan 2022 19:07:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 205J78hO031099; Wed, 5 Jan 2022 19:07:08 GMT (envelope-from git) Date: Wed, 5 Jan 2022 19:07:08 GMT Message-Id: <202201051907.205J78hO031099@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: 51cc50759b23 - main - graphics/librsvg2-rust: fix build on powerpc64le and powerpc 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: 51cc50759b234fe474a8c64ca96633a2b9128e03 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641409628; 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=ape7O+YKoRNxfespnDzPN0ZbZQtVTckBlbgwANhbdq4=; b=FmYszfR8N+7a50gpc4+ZJzk0NIBTQtTzivRbhfcwnhKTKwyk3aibw7AyXyss8WZX2q/qlA lGfJTnmH+BDkTVC1WBQ+f1PScMVFDCJsRxKbyG7V13fPuFhHVrkwRr6GZ0jPGRhwZ5fnnu 1o54QcKdyGwETY7PZK7+XwaaDSTFpn4v6YVweUYPe/RUxPJqiuw/ZdPMSXMcX6UILdjFJO RUzqzmgAX1VMZCD+pgmrHQ8qPrGIrVgkpCqjI7J21wpoXJXZFsph60gcxrIzzngKWjd/hq bdkgUYpGVxcdSlF7cyppbn6adK+D0OdY9Iv/XZAH9HxvLuf1gu9K9Pgptwovhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641409628; a=rsa-sha256; cv=none; b=O9eL7vnzlaCWbEofGakkabpRWVP021Hvnh6V8tFhcd/q2g5/jYcHePdbwkpOYDQ7c1ylYE SqJUq9BtXn0Wx6XXh2QVA6tfV0tfT4mobxFnrVQxKQB48aX2TOvDRJC2A8OcLtoxsXuf2T pKeLqAOsLU+Mcp3n8eIyd6kXRgjqB9c3Mxt6eQE/noQXnmZkNI7G0YAac2jRQl6myoqeC6 lL7udRQSk12VjmdxVU2FPkFaemKEpZykSmIgIov+gJzAcoZei1S2g8nd8uaYxmJNz1ZEAi IDDADdA+f37oEH+ugwjn0SqYS2xKK3xR63vfsKYtQFrg3VdEDapjw+GJBkaKhQ== 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=51cc50759b234fe474a8c64ca96633a2b9128e03 commit 51cc50759b234fe474a8c64ca96633a2b9128e03 Author: Piotr Kubaj AuthorDate: 2022-01-05 19:04:58 +0000 Commit: Piotr Kubaj CommitDate: 2022-01-05 19:04:58 +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. --- ...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"),