summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2021-09-07 12:09:19 +0300
committerSlava Barinov <v.barinov@samsung.com>2021-09-07 12:09:19 +0300
commitb1a62acec0a19395964e1801bba0353b113600ac (patch)
tree3218df64c6025e870d837d5798026f077a4d8e7b
parent6af2c3bdc0f7e9994e16e5654f487e3a854acb99 (diff)
downloadqemu-accel-b1a62acec0a19395964e1801bba0353b113600ac.tar.gz
qemu-accel-b1a62acec0a19395964e1801bba0353b113600ac.tar.bz2
qemu-accel-b1a62acec0a19395964e1801bba0353b113600ac.zip
Symlink fix
Change-Id: I706638c3792d5bdc5634dda3bdb27ba98885d6ec Signed-off-by: Slava Barinov <v.barinov@samsung.com>
-rw-r--r--packaging/qemu-accel-aarch64.spec5
-rw-r--r--packaging/qemu-accel-armv7hl.spec5
-rw-r--r--packaging/qemu-accel-armv7l.spec5
-rw-r--r--packaging/qemu-accel.spec.in5
4 files changed, 12 insertions, 8 deletions
diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 7559f61..b257122 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -571,12 +571,13 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' python
comm -13 %{_sourcedir}/qemu-accel.list python-full.list | sort -u > %{_sourcedir}/python-accel.list
## clang-accel
-# Add libstdc++ path symlinks
+# Add gcc header path symlinks
mkdir -p %{buildroot}/${gcc_install_dir}
ln -sf %{_libdir}/gcc/%{_host}/${gcc_version}/include %{buildroot}/${gcc_install_dir}
-echo "${gcc_install_dir}/include" >> clang.list
# Prepare clang files list
sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.list | sort -u > clang-full.list
+# Add gcc header paths symlink without /emul prefix
+echo "${gcc_install_dir}/include" >> clang.list
# Remove common files from clang-accel
comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index 1de7f82..1449129 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -571,12 +571,13 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' python
comm -13 %{_sourcedir}/qemu-accel.list python-full.list | sort -u > %{_sourcedir}/python-accel.list
## clang-accel
-# Add libstdc++ path symlinks
+# Add gcc header path symlinks
mkdir -p %{buildroot}/${gcc_install_dir}
ln -sf %{_libdir}/gcc/%{_host}/${gcc_version}/include %{buildroot}/${gcc_install_dir}
-echo "${gcc_install_dir}/include" >> clang.list
# Prepare clang files list
sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.list | sort -u > clang-full.list
+# Add gcc header paths symlink without /emul prefix
+echo "${gcc_install_dir}/include" >> clang.list
# Remove common files from clang-accel
comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index 41478bc..655c639 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -571,12 +571,13 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' python
comm -13 %{_sourcedir}/qemu-accel.list python-full.list | sort -u > %{_sourcedir}/python-accel.list
## clang-accel
-# Add libstdc++ path symlinks
+# Add gcc header path symlinks
mkdir -p %{buildroot}/${gcc_install_dir}
ln -sf %{_libdir}/gcc/%{_host}/${gcc_version}/include %{buildroot}/${gcc_install_dir}
-echo "${gcc_install_dir}/include" >> clang.list
# Prepare clang files list
sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.list | sort -u > clang-full.list
+# Add gcc header paths symlink without /emul prefix
+echo "${gcc_install_dir}/include" >> clang.list
# Remove common files from clang-accel
comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 3512e27..a80cfb3 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -568,12 +568,13 @@ sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' python
comm -13 %{_sourcedir}/qemu-accel.list python-full.list | sort -u > %{_sourcedir}/python-accel.list
## clang-accel
-# Add libstdc++ path symlinks
+# Add gcc header path symlinks
mkdir -p %{buildroot}/${gcc_install_dir}
ln -sf %{_libdir}/gcc/%{_host}/${gcc_version}/include %{buildroot}/${gcc_install_dir}
-echo "${gcc_install_dir}/include" >> clang.list
# Prepare clang files list
sed -e 's|^|%{emul_path}|;s|%{emul_path}/%{_lib}|%{emul_path}%{_libdir}|' clang.list | sort -u > clang-full.list
+# Add gcc header paths symlink without /emul prefix
+echo "${gcc_install_dir}/include" >> clang.list
# Remove common files from clang-accel
comm -13 %{_sourcedir}/qemu-accel.list clang-full.list > %{_sourcedir}/clang-accel.list