rust: Adapt to llvm changes, split out 32bit objects

Signed-off-by: Reilly Brogan <[email protected]>
getsolus · Nov 25, 2024 · a560dc2 · a560dc2
1 parent d1f397a
commit a560dc2
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 34 deletions.
diff --git a/common/CI/config.yaml b/common/CI/config.yaml
@@ -20,6 +20,7 @@ static_libs:
     - ocaml
     - qt5-tools
     - rocm-llvm
+    - rust
     - shadow
     - vlc
   # These files are allowed as static libraries:

diff --git a/packages/r/rust/package.yml b/packages/r/rust/package.yml
@@ -1,6 +1,6 @@
 name       : rust
 version    : 1.82.0
-release    : 133
+release    : 134
 source     :
     - https://static.rust-lang.org/dist/rustc-1.82.0-src.tar.xz : 1276a0bb8fa12288ba6fa96597d28b40e74c44257c051d3bc02c2b049bb38210
     - git|https://github.com/rust-lang/llvm-project.git : c54cff0e6e4d1a0d0a2df7c1ce3d96cdd554763e # rustc/18.1-2024-05-19
@@ -24,13 +24,16 @@ builddeps  :
     - pkgconfig(libgit2)
     - pkgconfig(liblzma)
     - pkgconfig(sqlite3)
+    - clang-32bit
     - glibc-32bit-devel
-    - libgcc-32bit
     - llvm-devel
     - rust
 rundeps    :
+    - 32bit :
+        - clang-32bit
+        - rust
     # We default to the LLVM toolchain for rust builds
-    - llvm-clang
+    - clang
 clang      : yes
 checkdeps  :
     - fakeroot-32bit
@@ -113,6 +116,8 @@ check      : |
     python3 x.py test $common_opts src/test/run-fail     || :
     python3 x.py test $common_opts src/test/run-make     || :
 patterns   :
+    - 32bit :
+        - /usr/lib64/rustlib/i686*
     - devel :
         - /usr/bin/cargo-clippy
         - /usr/bin/cargo-fmt

diff --git a/packages/r/rust/pspec_x86_64.xml b/packages/r/rust/pspec_x86_64.xml
@@ -24,34 +24,6 @@
             <Path fileType="executable">/usr/bin/rustdoc</Path>
             <Path fileType="library">/usr/lib64/librustc_driver-dd20c24b66c8a0a0.so</Path>
             <Path fileType="library">/usr/lib64/libstd-5774737e3c7a42ca.so</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-06e092150d7ddced.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libadler-452cc508100aa509.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/liballoc-0ca485430ce4f2c6.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-7ddddc1783330e26.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-bf097401c4536fb5.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libcore-d55f9bf30c92183d.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libgetopts-82b0224a91bef382.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libgimli-e545dcfb24017515.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-a14c26f9678f4e18.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/liblibc-c241972cdc60522c.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libmemchr-532b7451efa0251a.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-d8936eb80ac8f069.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libobject-3920a26244077cbf.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-34e86fcc69967dc7.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-ff17e2007f50a0e5.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-f2d795508757bff7.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-a7bb8d2e6b681591.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-6729e4509421fe77.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-700f1dcaf8029449.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-44fc57734e731b62.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-3dcf4d985356a6e4.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libstd-c253e54e847e643b.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libstd-c253e54e847e643b.so</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-23933d3352f9626a.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libsysroot-bb6bccfe49829c53.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libtest-0b1068d099d805e9.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-b92dc94ae4844bbb.rlib</Path>
-            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libunwind-fad7515a167e5daa.rlib</Path>
             <Path fileType="library">/usr/lib64/rustlib/x86_64-unknown-linux-gnu/bin/wasm-component-ld</Path>
             <Path fileType="library">/usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libaddr2line-572e82f5ba2b69b4.rlib</Path>
             <Path fileType="library">/usr/lib64/rustlib/x86_64-unknown-linux-gnu/lib/libadler-0ee8f28cb4dfed1d.rlib</Path>
@@ -130,13 +102,52 @@
             <Path fileType="data">/usr/share/zsh/site-functions/_cargo</Path>
         </Files>
     </Package>
+    <Package>
+        <Name>rust-32bit</Name>
+        <Summary xml:lang="en">32-bit libraries for rust</Summary>
+        <Description xml:lang="en">Rust is a systems programming language that runs blazingly fast, prevents nearly all segfaults, and guarantees thread safety.</Description>
+        <PartOf>emul32</PartOf>
+        <RuntimeDependencies>
+            <Dependency release="134">rust</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libaddr2line-06e092150d7ddced.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libadler-452cc508100aa509.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/liballoc-0ca485430ce4f2c6.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-7ddddc1783330e26.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-bf097401c4536fb5.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libcore-d55f9bf30c92183d.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libgetopts-82b0224a91bef382.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libgimli-e545dcfb24017515.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-a14c26f9678f4e18.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/liblibc-c241972cdc60522c.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libmemchr-532b7451efa0251a.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libminiz_oxide-d8936eb80ac8f069.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libobject-3920a26244077cbf.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-34e86fcc69967dc7.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-ff17e2007f50a0e5.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-f2d795508757bff7.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-a7bb8d2e6b681591.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-6729e4509421fe77.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-700f1dcaf8029449.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-44fc57734e731b62.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_std-3dcf4d985356a6e4.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libstd-c253e54e847e643b.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libstd-c253e54e847e643b.so</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libstd_detect-23933d3352f9626a.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libsysroot-bb6bccfe49829c53.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libtest-0b1068d099d805e9.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-b92dc94ae4844bbb.rlib</Path>
+            <Path fileType="library">/usr/lib64/rustlib/i686-unknown-linux-gnu/lib/libunwind-fad7515a167e5daa.rlib</Path>
+        </Files>
+    </Package>
     <Package>
         <Name>rust-devel</Name>
         <Summary xml:lang="en">Tools and stdlib source for developing with Rust</Summary>
         <Description xml:lang="en">Tools and stdlib source for developing with Rust</Description>
         <PartOf>programming.devel</PartOf>
         <RuntimeDependencies>
-            <Dependency release="133">rust</Dependency>
+            <Dependency release="134">rust</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/cargo-clippy</Path>
@@ -1858,8 +1869,8 @@
         </Files>
     </Package>
     <History>
-        <Update release="133">
-            <Date>2024-10-20</Date>
+        <Update release="134">
+            <Date>2024-11-23</Date>
             <Version>1.82.0</Version>
             <Comment>Packaging update</Comment>
             <Name>Reilly Brogan</Name>
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ static_libs: @@
         - ocaml
         - qt5-tools
         - rocm-llvm
+        - rust
         - shadow
         - vlc
       # These files are allowed as static libraries:
@@ Expand Down @@