diff options
| -rw-r--r-- | packaging/qemu-accel-aarch64.spec | 4 | ||||
| -rw-r--r-- | packaging/qemu-accel-armv7l.spec | 4 | ||||
| -rw-r--r-- | packaging/qemu-accel.spec.in | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index f267cf0..7e735c5 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -433,6 +433,10 @@ awk '/post "/ && !x {print $0; print " post \"echo export\\ CLANG_NO_LIBDIR_SUF 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 } +# Remove the ld-$VERSION.so to prevent name clashing with native ld.so +find %{buildroot}%{our_path}%{_libdir} -name 'ld-*.so' -delete +sed -e '\|%{our_path}%{_libdir}/ld-[[:digit:]].*\.so|d' -i %{_sourcedir}/all-accel.list + # allow build of baselibs.conf sed -e "/targettype %{cross} block!/d" -i %{_sourcedir}/baselibs.conf diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index b202934..fb7c359 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -433,6 +433,10 @@ awk '/post "/ && !x {print $0; print " post \"echo export\\ CLANG_NO_LIBDIR_SUF 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 } +# Remove the ld-$VERSION.so to prevent name clashing with native ld.so +find %{buildroot}%{our_path}%{_libdir} -name 'ld-*.so' -delete +sed -e '\|%{our_path}%{_libdir}/ld-[[:digit:]].*\.so|d' -i %{_sourcedir}/all-accel.list + # allow build of baselibs.conf sed -e "/targettype %{cross} block!/d" -i %{_sourcedir}/baselibs.conf diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index 22c2ae8..e073b71 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -430,6 +430,10 @@ awk '/post "/ && !x {print $0; print " post \"echo export\\ CLANG_NO_LIBDIR_SUF 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 } +# Remove the ld-$VERSION.so to prevent name clashing with native ld.so +find %{buildroot}%{our_path}%{_libdir} -name 'ld-*.so' -delete +sed -e '\|%{our_path}%{_libdir}/ld-[[:digit:]].*\.so|d' -i %{_sourcedir}/all-accel.list + # allow build of baselibs.conf sed -e "/targettype %{cross} block!/d" -i %{_sourcedir}/baselibs.conf |