Просмотр исходного кода

add multilib support here, too

Ralf S. Engelschall 23 лет назад
Родитель
Сommit
b6db1f0d0a
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      gcc32/gcc32.spec

+ 8 - 1
gcc32/gcc32.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [PLUS]
 Group:        Language
 License:      GPL
 Version:      %{V_full}
-Release:      20030702
+Release:      20030704
 
 #   package options
 %option       with_cxx       yes
@@ -183,6 +183,13 @@ Provides:     gcc = %{version}-%{release}
     #   cleanup installation tree
     mv $RPM_BUILD_ROOT%{l_prefix}/lib/lib*.a \
        $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/
+    for multilib in `$RPM_BUILD_ROOT%{l_prefix}/bin/gcc --print-multi-lib`; do
+        subdir=`echo "$multilib" | sed -e 's/;.*$//'`
+        [ ".$subdir" = .. ] && continue
+        mv $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir/lib*.a \
+           $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/$subdir/
+        rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/$subdir
+    done
     mv $RPM_BUILD_ROOT%{l_prefix}/${triple}/include/* \
        $RPM_BUILD_ROOT%{l_prefix}/lib/gcc%{V_comp}-lib/${triple}/%{V_full}/include/ \
            >/dev/null 2>&1 || true