From 838801f8f41844cf7bb15523819a2377f08fbf56 Mon Sep 17 00:00:00 2001 From: Mikael Urankar Date: Wed, 16 Aug 2023 11:13:04 +0200 Subject: [PATCH] Update linkme to 0.3.4 It works when it's built with RUSTFLAGS="-Clink-dead-code" Broken with https://github.com/dtolnay/linkme/commit/64e7c63c106848481bea8f66c4885b52c26ca9ec Reported here: https://github.com/dtolnay/linkme/issues/49 --- ports/net-im/libsignal-node/Makefile | 7 +++-- ports/net-im/libsignal-node/distinfo | 10 +++---- .../libsignal-node/files/patch-Cargo.lock | 30 ------------------- .../files/patch-rust_bridge_shared_Cargo.toml | 11 ------- 4 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 ports/net-im/libsignal-node/files/patch-Cargo.lock delete mode 100644 ports/net-im/libsignal-node/files/patch-rust_bridge_shared_Cargo.toml diff --git a/ports/net-im/libsignal-node/Makefile b/ports/net-im/libsignal-node/Makefile index b71edd0..a424173 100644 --- a/ports/net-im/libsignal-node/Makefile +++ b/ports/net-im/libsignal-node/Makefile @@ -158,8 +158,8 @@ CARGO_CRATES= addr2line-0.19.0 \ libloading-0.7.4 \ libm-0.1.4 \ libm-0.2.7 \ - linkme-0.3.0 \ - linkme-impl-0.3.0\ + linkme-0.3.9 \ + linkme-impl-0.3.9 \ linux-raw-sys-0.3.8 \ log-0.4.17 \ log-panics-2.1.0 \ @@ -314,7 +314,8 @@ CARGO_CRATES= addr2line-0.19.0 \ MAKE_ENV= HOME=${WRKDIR} \ PYTHON=${PYTHON_CMD} \ - XDG_CACHE_HOME=${WRKDIR}/.cache + XDG_CACHE_HOME=${WRKDIR}/.cache \ + RUSTFLAGS=-Clink-dead-code MAKE_ENV+= RUSTC_BOOTSTRAP=aes,polyval diff --git a/ports/net-im/libsignal-node/distinfo b/ports/net-im/libsignal-node/distinfo index 392f2cb..3551c1f 100644 --- a/ports/net-im/libsignal-node/distinfo +++ b/ports/net-im/libsignal-node/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1692106801 +TIMESTAMP = 1692176971 SHA256 (libsignal-node-0.29.1-yarn-cache.tar.gz) = 779d8f18f6890e6c470a21eaf894429d9e234e4a3aaab090ba2579cc69f4b531 SIZE (libsignal-node-0.29.1-yarn-cache.tar.gz) = 23540764 SHA256 (rust/crates/addr2line-0.19.0.crate) = a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97 @@ -269,10 +269,10 @@ SHA256 (rust/crates/libm-0.1.4.crate) = 7fc7aa29613bd6a620df431842069224d8bc9011 SIZE (rust/crates/libm-0.1.4.crate) = 110593 SHA256 (rust/crates/libm-0.2.7.crate) = f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4 SIZE (rust/crates/libm-0.2.7.crate) = 115688 -SHA256 (rust/crates/linkme-0.3.0.crate) = 84d3281696e1152aa61e900ff5729b0775bd4878a299aa00165d1480e9d3d1ab -SIZE (rust/crates/linkme-0.3.0.crate) = 12089 -SHA256 (rust/crates/linkme-impl-0.3.0.crate) = 0289997a403cb54131d93cb2686d5f23981b8d8a11c134cd1607efe891d3d01b -SIZE (rust/crates/linkme-impl-0.3.0.crate) = 6243 +SHA256 (rust/crates/linkme-0.3.9.crate) = af8a3edd8a2d2a8432c78a3c791c93503ec2c5f0aedab26937cafd2f4ca9f013 +SIZE (rust/crates/linkme-0.3.9.crate) = 12592 +SHA256 (rust/crates/linkme-impl-0.3.9.crate) = c880e0101fc5844ae1c2f3b5b50aba1fb1939e308149dc2dde33b80a0816df18 +SIZE (rust/crates/linkme-impl-0.3.9.crate) = 6726 SHA256 (rust/crates/linux-raw-sys-0.3.8.crate) = ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519 SIZE (rust/crates/linux-raw-sys-0.3.8.crate) = 1013776 SHA256 (rust/crates/log-0.4.17.crate) = abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e diff --git a/ports/net-im/libsignal-node/files/patch-Cargo.lock b/ports/net-im/libsignal-node/files/patch-Cargo.lock deleted file mode 100644 index e178307..0000000 --- a/ports/net-im/libsignal-node/files/patch-Cargo.lock +++ /dev/null @@ -1,30 +0,0 @@ ---- Cargo.lock.orig 2023-08-15 15:46:35.806040000 +0200 -+++ Cargo.lock 2023-08-15 15:47:28.298258000 +0200 -@@ -1455,22 +1455,22 @@ name = "linkme" - - [[package]] - name = "linkme" --version = "0.3.9" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "af8a3edd8a2d2a8432c78a3c791c93503ec2c5f0aedab26937cafd2f4ca9f013" -+checksum = "84d3281696e1152aa61e900ff5729b0775bd4878a299aa00165d1480e9d3d1ab" - dependencies = [ - "linkme-impl", - ] - - [[package]] - name = "linkme-impl" --version = "0.3.9" -+version = "0.3.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c880e0101fc5844ae1c2f3b5b50aba1fb1939e308149dc2dde33b80a0816df18" -+checksum = "0289997a403cb54131d93cb2686d5f23981b8d8a11c134cd1607efe891d3d01b" - dependencies = [ - "proc-macro2", - "quote", -- "syn 2.0.17", -+ "syn 1.0.109", - ] - - [[package]] diff --git a/ports/net-im/libsignal-node/files/patch-rust_bridge_shared_Cargo.toml b/ports/net-im/libsignal-node/files/patch-rust_bridge_shared_Cargo.toml deleted file mode 100644 index 0fd1c2e..0000000 --- a/ports/net-im/libsignal-node/files/patch-rust_bridge_shared_Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ ---- rust/bridge/shared/Cargo.toml.orig 2023-08-15 15:46:43.150761000 +0200 -+++ rust/bridge/shared/Cargo.toml 2023-08-15 15:46:54.578123000 +0200 -@@ -40,7 +40,7 @@ neon = { version = "0.10.0", optional = true, default- - libc = { version = "0.2", optional = true } - jni_crate = { version = "0.19", package = "jni", optional = true } - neon = { version = "0.10.0", optional = true, default-features = false, features = ["napi-6", "promise-api"] } --linkme = { version = "0.3.9", optional = true } -+linkme = { version = "0.3.0", optional = true } - signal-neon-futures = { path = "../node/futures", optional = true } - - [features]