Switch off strip because of patchelf bugsandbox/vbarinov/nostrip

Change-Id: I061bd7c6d8fea9e8605a898ca55c4099ce0f25dd

4 files changed, 11 insertions, 11 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 50b67a5..e86d188 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -27,9 +27,9 @@
 %define libdir %{_prefix}/lib%{?aarch64:64}
 
 #disable strip debug info due to patchelf + armv7hl bug
-%{?armv7hl:
+%ifarch armv7l aarch64
 %define _rpm_strip_disable 1
-}
+%endif
 
 # default path in qemu
 %define our_path /emul
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 9da2b05..1f60846 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -27,9 +27,9 @@
 %define libdir %{_prefix}/lib%{?aarch64:64}
 
 #disable strip debug info due to patchelf + armv7hl bug
-%{?armv7hl:
+%ifarch armv7l aarch64
 %define _rpm_strip_disable 1
-}
+%endif
 
 # default path in qemu
 %define our_path /emul
@@ -429,16 +429,16 @@ cat %{_sourcedir}/baselibs_prologue %{_sourcedir}/baselibs_body > %{_sourcedir}/
 # Find gcc install directory
 gcc_install_dir=$(%{target_arch}-gcc -print-search-dirs | sed -ne '/install: /s/install: //p')
 # update baselibs.conf, overwrite LTO plugin
-sed -i -e "s,#PLUGIN_POSTIN#,ln -sf %{our_path}${gcc_install_dir}/liblto_plugin.so %{libdir}/gcc/%{target_arch}/${gcc_version}/liblto_plugin.so," %{_sourcedir}/baselibs.conf
+sed -i -e "s,#PLUGIN_POSTIN#,if [ -d %{libdir}/gcc/%{target_arch}/${gcc_version} ]; then\"\n  post \"  ln -sf %{our_path}${gcc_install_dir}/liblto_plugin.so %{libdir}/gcc/%{target_arch}/${gcc_version}/liblto_plugin.so\"\n  post \"fi," %{_sourcedir}/baselibs.conf
 sed -i -e "s,#PLUGIN_POSTUN#,ln -sf liblto_plugin.so.0 ${gcc_install_dir}/liblto_plugin.so," %{_sourcedir}/baselibs.conf
 
 # Use /usr/lib for cross clang libdir on armv7l architecture
 %{?armv7l:
-awk '/post "/ && !x {print $0; print "  post \"echo export\\ CLANG_NO_LIBDIR_SUFFIX=1 >> /etc/profile\""; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
+awk '/post "/ && !x {print "  post \"echo export\\ CLANG_NO_LIBDIR_SUFFIX=1 >> /etc/profile\""; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
 
 %{?multilib:
-awk '/post "/ && !x {print $0; print "  post \"echo '%{our_path}/lib' >> /etc/ld.so.conf\"\n"; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
+awk '/post "/ && !x {print "  post \"echo '%{our_path}/lib' >> /etc/ld.so.conf\"\n"; print $0; x=1;next} 1' %{_sourcedir}/baselibs.conf > baselibs_updated && mv baselibs_updated %{_sourcedir}/baselibs.conf
 }
 
 # Remove the ld-$VERSION.so to prevent name clashing with native ld.so
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index bb0dafa..8f11d53 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -27,9 +27,9 @@
 %define libdir %{_prefix}/lib%{?aarch64:64}
 
 #disable strip debug info due to patchelf + armv7hl bug
-%{?armv7hl:
+%ifarch armv7l aarch64
 %define _rpm_strip_disable 1
-}
+%endif
 
 # default path in qemu
 %define our_path /emul
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 18646d8..81a60e3 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -24,9 +24,9 @@
 %define libdir %{_prefix}/lib%{?aarch64:64}
 
 #disable strip debug info due to patchelf + armv7hl bug
-%{?armv7hl:
+%ifarch armv7l aarch64
 %define _rpm_strip_disable 1
-}
+%endif
 
 # default path in qemu
 %define our_path /emul