From 4dc75ec94fde6e3ae38f4ab4dceede226fc85f5c Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 9 Feb 2023 16:04:59 +0900 Subject: [PATCH] Adjust rustc_dylib_build macro --- packaging/rust-proc-macro2.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/packaging/rust-proc-macro2.spec b/packaging/rust-proc-macro2.spec index 2e9fdeb..8d6447e 100644 --- a/packaging/rust-proc-macro2.spec +++ b/packaging/rust-proc-macro2.spec @@ -37,20 +37,17 @@ cp %{SOURCE1} . # build section # ========================================================== %build -rust_std=$(find %{_libdir} -maxdepth 1 -name "libstd-*\.so") -rustc -C prefer-dynamic \ - --crate-type=dylib \ - --crate-name="%{real_crate_name}" \ - --extern std=${rust_std} \ - -L%{_libdir} -lunicode_ident \ - ./src/lib.rs +%{rustc_dylib_build} \ + --crate-name=%{real_crate_name} \ + -L%{_libdir} -lunicode_ident \ + ./src/lib.rs # ========================================================== # install section # ========================================================== %install -install -d -m 0755 %{buildroot}%{_libdir} -install -m 0644 lib%{real_crate_name}.so %{buildroot}/%{_libdir}/lib%{real_crate_name}.so +install -d -m 0755 %{buildroot}%{_rust_libdir} +install -m 0644 lib%{real_crate_name}.so %{buildroot}/%{_rust_libdir}/lib%{real_crate_name}.so %clean @@ -65,4 +62,4 @@ install -m 0644 lib%{real_crate_name}.so %{buildroot}/%{_libdir}/lib%{real_crate %manifest %{name}.manifest %license LICENSE-APACHE %license LICENSE-MIT -%{_libdir}/lib%{real_crate_name}.so +%{_rust_libdir}/lib%{real_crate_name}.so -- 2.34.1