diff options
| author | Slava Barinov <v.barinov@samsung.com> | 2017-08-01 11:37:43 +0300 |
|---|---|---|
| committer | Slava Barinov <v.barinov@samsung.com> | 2017-08-01 11:37:43 +0300 |
| commit | 3325c20b1371d4f708020435d8d0787e39304d48 (patch) | |
| tree | 1b5ff33c2ec0cd36bfeb57009b299d0a1fdfdccf | |
| parent | 491c3ede6e57dee0cf6e89f4bf8bc585f0525dba (diff) | |
| download | qemu-accel-3325c20b1371d4f708020435d8d0787e39304d48.tar.gz qemu-accel-3325c20b1371d4f708020435d8d0787e39304d48.tar.bz2 qemu-accel-3325c20b1371d4f708020435d8d0787e39304d48.zip | |
Remove ld.so from /emul to prevent name clashingsubmit/tizen_base/20170802.001517submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170804.132512accepted/tizen/4.0/base/20170828.221341accepted/tizen/4.0/base/20170811.093039
In certain cases (e.g. qemu-accel-aarch64 on x86_64 host) ld-2.24.so from /emul
can be executed instead of native one, this break `ldd' tool.
Change-Id: Ibb21d9356f9770d23b12ac94c38c9228cef618b6
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
| -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 |