diff options
| author | Slava Barinov <v.barinov@samsung.com> | 2021-04-21 11:46:03 +0300 |
|---|---|---|
| committer | Slava Barinov <v.barinov@samsung.com> | 2021-04-21 13:01:40 +0300 |
| commit | 63cc2e9d512c36ca662f0af2411395b935fa82a7 (patch) | |
| tree | fdf69d3669c8e677520f6bafe226ccd45cf76cbf | |
| parent | 49f50961a0159a94758c4b8582d87060f442db78 (diff) | |
| download | qemu-accel-63cc2e9d512c36ca662f0af2411395b935fa82a7.tar.gz qemu-accel-63cc2e9d512c36ca662f0af2411395b935fa82a7.tar.bz2 qemu-accel-63cc2e9d512c36ca662f0af2411395b935fa82a7.zip | |
Add whole glibc and libgcc contents to qemu-accelsubmit/tizen_base/20210426.080407accepted/tizen/base/tool/20210503.092841
These libraries could be used by some tools, like CoreCLR build tools, but they
are not included by default and therefore make build impossible.
Change-Id: I0d91b64546bedca92277292851ccb6511936ad03
Signed-off-by: Slava Barinov <v.barinov@samsung.com>
| -rw-r--r-- | packaging/qemu-accel-aarch64.spec | 9 | ||||
| -rw-r--r-- | packaging/qemu-accel-armv7hl.spec | 9 | ||||
| -rw-r--r-- | packaging/qemu-accel-armv7l.spec | 9 | ||||
| -rw-r--r-- | packaging/qemu-accel.spec.in | 9 |
4 files changed, 32 insertions, 4 deletions
diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index 583faa7..1c9c9fb 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -165,7 +165,14 @@ host_python="python$(python --version 2>&1 | sed -ne '1s/.* //p' | head -c 3)" # Emul path inside buildroot for installation buildroot_emul_path=%{buildroot}%{emul_path} -binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlopen by glibc +# Collect all shared objects from glibc and libgcc +# excluding RTLD since it's processed in another way later +for lib in $(rpm -ql glibc) \ + $(rpm -ql libgcc) +do + [[ "$lib" =~ .*\.so(\.[[:digit:]]+)?$ && ! "$lib" =~ /ld- ]] && binaries="$binaries $lib" +done + %ifarch %ix86 LD="/%{_lib}/ld-linux.so.2" %endif diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec index 1adabe6..ecdb4d6 100644 --- a/packaging/qemu-accel-armv7hl.spec +++ b/packaging/qemu-accel-armv7hl.spec @@ -165,7 +165,14 @@ host_python="python$(python --version 2>&1 | sed -ne '1s/.* //p' | head -c 3)" # Emul path inside buildroot for installation buildroot_emul_path=%{buildroot}%{emul_path} -binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlopen by glibc +# Collect all shared objects from glibc and libgcc +# excluding RTLD since it's processed in another way later +for lib in $(rpm -ql glibc) \ + $(rpm -ql libgcc) +do + [[ "$lib" =~ .*\.so(\.[[:digit:]]+)?$ && ! "$lib" =~ /ld- ]] && binaries="$binaries $lib" +done + %ifarch %ix86 LD="/%{_lib}/ld-linux.so.2" %endif diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec index 08bcb66..98d0dc1 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -165,7 +165,14 @@ host_python="python$(python --version 2>&1 | sed -ne '1s/.* //p' | head -c 3)" # Emul path inside buildroot for installation buildroot_emul_path=%{buildroot}%{emul_path} -binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlopen by glibc +# Collect all shared objects from glibc and libgcc +# excluding RTLD since it's processed in another way later +for lib in $(rpm -ql glibc) \ + $(rpm -ql libgcc) +do + [[ "$lib" =~ .*\.so(\.[[:digit:]]+)?$ && ! "$lib" =~ /ld- ]] && binaries="$binaries $lib" +done + %ifarch %ix86 LD="/%{_lib}/ld-linux.so.2" %endif diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in index 3f8eaea..0767396 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -162,7 +162,14 @@ host_python="python$(python --version 2>&1 | sed -ne '1s/.* //p' | head -c 3)" # Emul path inside buildroot for installation buildroot_emul_path=%{buildroot}%{emul_path} -binaries="%{_libdir}/libnsl.so.1 %{_libdir}/libnss_compat.so.2" # loaded via dlopen by glibc +# Collect all shared objects from glibc and libgcc +# excluding RTLD since it's processed in another way later +for lib in $(rpm -ql glibc) \ + $(rpm -ql libgcc) +do + [[ "$lib" =~ .*\.so(\.[[:digit:]]+)?$ && ! "$lib" =~ /ld- ]] && binaries="$binaries $lib" +done + %ifarch %ix86 LD="/%{_lib}/ld-linux.so.2" %endif |