Merge pull request #560 from serpent-os/fix-rust-maybe

rust: Build without cargo
serpent-os · Jan 20, 2025 · 8747bce · 8747bce
2 parents 6d2300c + 52b6071
commit 8747bce
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 69 deletions.
diff --git a/r/rust/manifest.x86_64.bin b/r/rust/manifest.x86_64.bin
diff --git a/r/rust/manifest.x86_64.jsonc b/r/rust/manifest.x86_64.jsonc
@@ -5,7 +5,6 @@
 		"rust": {
 			"build-depends": [
 				"binary(FileCheck)",
-				"binary(cargo)",
 				"binary(cc)",
 				"binary(cmake)",
 				"binary(llvm-config)",
@@ -47,41 +46,41 @@
 				"/usr/bin/cargo",
 				"/usr/bin/rustc",
 				"/usr/bin/rustdoc",
-				"/usr/lib/librustc_driver-4c7ed3667bc741ad.so",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-4b1809109a4864f0.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-f0d7ddca4c2ce7c6.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-cf7cf3d49798e2c9.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-bcae4fb680a8a32e.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-d19bd31606928c35.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-8b2b4dcb22482b1b.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-21897109e5b4f20e.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-2195180b2bb58a25.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-7be42a37a1db888e.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-b47e35d24b33bd7d.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-e347c00c2a8e5533.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-a6ffd57152ac3ed8.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-f0bfb115c1d0af5b.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-1a927095a1e8310b.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-86691733210c279e.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-a8549756f9c1682a.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-f945ee2618763860.rlib",
+				"/usr/lib/librustc_driver-42efff2b306016c9.so",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-a130693cc4881d99.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libadler-242449eebc0f71eb.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-bb8908dc3a7e1310.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-1e27883074337ccb.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-3070cb005c88f342.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-490cbe6313aaf5e0.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-b601b3f12cc0a2e5.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgimli-cff70b298f6e8b12.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-4a7aae81c8b30c09.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-7a733d3726d52184.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemchr-baf8efd0e893d345.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_oxide-0c56cc6ba33fca12.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libobject-7a2a6b386480e49f.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-4f0dbca88c80508a.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-b8183d88873341f7.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-f5bb1f4a69f8ace5.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-e314b9f686a46ae0.rlib",
 				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.asan.a",
 				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.dfsan.a",
 				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.lsan.a",
 				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.msan.a",
 				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.safestack.a",
 				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-stable_rt.tsan.a",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-ed645812d1b1817a.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-f030b778d4582683.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-adb13660b2ed6f2d.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-c3b02ff051958b29.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-83024bc6e2c63159.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-83024bc6e2c63159.so",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-55b45181eae3b109.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsysroot-9b20191441ec2a5a.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-494ff5c68f3401d5.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-17e75188cf500b46.rlib",
-				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-6c8dd9b3c6408885.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-badf65b66afd25bc.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-66669359150e656f.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-91f063347765b4f3.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_std-d56e46ba15d0df6e.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-a0c98d706165b0b7.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-a0c98d706165b0b7.so",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd_detect-2972f19bcd5d403f.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsysroot-2d1fd7bde1d96915.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-96653b5d1a5eb36f.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-d604303a8777d81e.rlib",
+				"/usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-812d7f3b58627f93.rlib",
 				"/usr/share/bash-completion/completions/cargo",
 				"/usr/share/man/man1/cargo-add.1",
 				"/usr/share/man/man1/cargo-bench.1",
@@ -129,14 +128,13 @@
 				"binary(cargo)",
 				"binary(rustc)",
 				"binary(rustdoc)",
-				"soname(librustc_driver-4c7ed3667bc741ad.so(x86_64))",
-				"soname(rustlib/x86_64-unknown-linux-gnu/lib/libstd-83024bc6e2c63159.so(x86_64))"
+				"soname(librustc_driver-42efff2b306016c9.so(x86_64))",
+				"soname(rustlib/x86_64-unknown-linux-gnu/lib/libstd-a0c98d706165b0b7.so(x86_64))"
 			]
 		},
 		"rust-32bit": {
 			"build-depends": [
 				"binary(FileCheck)",
-				"binary(cargo)",
 				"binary(cc)",
 				"binary(cmake)",
 				"binary(llvm-config)",
@@ -165,45 +163,44 @@
 				"soname(libunwind.so.1(386))"
 			],
 			"files": [
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-61b971ea95f93310.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-762fe2b7475f5370.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-f9dfa194c6dcc05f.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-d009a9de6e1394fc.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-e5d861c44d4f9615.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-3aae7fb835bd592a.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-e31ccdbc9f0d3c59.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-c2921547a37f79e2.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-26da7faea7c6be96.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-f752cd40e7762ce3.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemchr-b0f0ad6d830d42a3.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-eab2e7cc7a53e67a.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-bd2dc9b152a5cfee.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-0dcbde20f33cfe32.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-4f946fe7c9bb3ef4.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-9dcb6efbba75e888.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-dd74f2f2e6697f2b.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-d9b7b97b6270d3f6.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-749ce90092f5554c.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-a1ae535b5a1cbca7.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-a82c9466f79bafd4.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-d7d42802c6af3b7a.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-d7d42802c6af3b7a.so",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-36f134b74dfef89e.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsysroot-e1e04737fb0e7970.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-5cb2b6a76ac5ca03.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-66fbd71a43b41756.rlib",
-				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-7bfca4abb93ce374.rlib"
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-0c911f7763906247.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libadler-7a56691ba0169b91.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-f1182a17cfb5c324.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-28994555685578ba.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-e1b9e96b391ba622.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-a4e47d8c78c19bcb.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-e8c2e5f2125fa5dd.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgimli-d68a69cf585c950f.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-c926c172e15aaadf.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-08f776ff5aab7fbf.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemchr-bc4338620e3a4cee.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-e81c1da26f57d379.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libobject-a2be199f19e6c82e.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-c1fd0ec0934fa425.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-17fd613084624945.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-39e1134a470f791b.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-c487660a505750c6.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-823047b19dceef8f.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-cc4420bf8ccbd3a5.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-73676c58afe88847.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-720f22809f4fe7b3.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-d16ca275b31875cf.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-d16ca275b31875cf.so",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-76299c5473b351a2.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsysroot-ef63b3a28c64addf.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-f6b5a1ceab9470aa.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-fcda9f1100215302.rlib",
+				"/usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-5a4e5e58cb66351a.rlib"
 			],
 			"name": "rust-32bit",
 			"provides": [
-				"soname(rustlib/i686-unknown-linux-gnu/lib/libstd-d7d42802c6af3b7a.so(386))",
-				"soname(rustlib/i686-unknown-linux-gnu/lib/libstd-d7d42802c6af3b7a.so(x86))"
+				"soname(rustlib/i686-unknown-linux-gnu/lib/libstd-d16ca275b31875cf.so(386))",
+				"soname(rustlib/i686-unknown-linux-gnu/lib/libstd-d16ca275b31875cf.so(x86))"
 			]
 		},
 		"rust-devel": {
 			"build-depends": [
 				"binary(FileCheck)",
-				"binary(cargo)",
 				"binary(cc)",
 				"binary(cmake)",
 				"binary(llvm-config)",
@@ -230,7 +227,7 @@
 				"soname(ld-linux-x86-64.so.2(x86_64))",
 				"soname(libc.so.6(x86_64))",
 				"soname(libm.so.6(x86_64))",
-				"soname(librustc_driver-4c7ed3667bc741ad.so(x86_64))",
+				"soname(librustc_driver-42efff2b306016c9.so(x86_64))",
 				"soname(libunwind.so.1(x86_64))"
 			],
 			"files": [
@@ -2000,7 +1997,6 @@
 		"rust-docs": {
 			"build-depends": [
 				"binary(FileCheck)",
-				"binary(cargo)",
 				"binary(cc)",
 				"binary(cmake)",
 				"binary(llvm-config)",
@@ -2044,6 +2040,6 @@
 		}
 	},
 	"source-name": "rust",
-	"source-release": "11",
+	"source-release": "12",
 	"source-version": "1.83.0"
 }
diff --git a/r/rust/stone.yaml b/r/rust/stone.yaml
@@ -5,7 +5,7 @@
 #
 name        : rust
 version     : 1.83.0
-release     : 11
+release     : 12
 homepage    : https://www.rust-lang.org/
 upstreams   :
     - https://static.rust-lang.org/dist/rustc-1.83.0-src.tar.xz : 7b11d4242dab0921a7d54758ad3fe805153c979c144625fecde11735760f97df
@@ -29,7 +29,7 @@ license     :
 networking  : true
 builddeps   :
     - binary(FileCheck)
-    - binary(cargo)
+    # - binary(cargo)
     - binary(cc)
     - binary(cmake)
     - binary(llvm-config)