[packaging] Disable lto for cross build for now. Fixes JB#44936

sailfishos · Feb 25, 2019 · 05f90a3 · 05f90a3
1 parent a8d440a
commit 05f90a3
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 84 deletions.
diff --git a/cross-aarch64-gcc.spec b/cross-aarch64-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv5tel-gcc.spec b/cross-armv5tel-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv6l-gcc.spec b/cross-armv6l-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv7hl-gcc.spec b/cross-armv7hl-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv7l-gcc.spec b/cross-armv7l-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv7nhl-gcc.spec b/cross-armv7nhl-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv7thl-gcc.spec b/cross-armv7thl-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-armv7tnhl-gcc.spec b/cross-armv7tnhl-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif
diff --git a/cross-i486-gcc.spec b/cross-i486-gcc.spec
@@ -799,7 +799,10 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
 	--enable-checking=release \
         --disable-fixed-point \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
-	--enable-gnu-unique-object --enable-lto \
+	--enable-gnu-unique-object \
+%if !%{crossbuild}
+        --enable-lto \
+%endif
 	--enable-linker-build-id \
 %if %{bootstrap} == 0
 	--enable-languages=c,c++,objc,obj-c++ \
@@ -1178,10 +1181,6 @@ ln -sf %{cross_gcc_target_platform}-gcc %{buildroot}%{_prefix}/bin/%{cross_gcc_t
 set -x
 rm -rRf %buildroot/%{_prefix}/lib/libiberty.a
 rm -rRf %buildroot/%{_prefix}/share
-mkdir  -p %{buildroot}%{_prefix}/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}%{_prefix}/lib/bfd-plugins/
-mkdir  -p %{buildroot}/usr/lib/bfd-plugins
-ln -s %{_prefix}/libexec/gcc/%{cross_gcc_target_platform}/%{gcc_version}/liblto_plugin.so %{buildroot}/usr/lib/bfd-plugins/
 set +x
 # /\/\/\
 # cross
@@ -1376,9 +1375,11 @@ fi
 
 # Shouldn't include all files under this fold, split to diff pkgs
 #%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%if !%{crossbuild}
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto1
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/lto-wrapper
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/liblto_plugin.so*
+%endif
 
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
 
@@ -1792,8 +1793,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %{_prefix}
-%dir /usr/lib/bfd-plugins
-/usr/lib/bfd-plugins/liblto_plugin.so
 # /\/\/\
 # cross
 %endif