Revert "Add guile acceleration support"accepted/tizen/base/x/asan/20240220.072049tizen_base_dev_asansandbox/dkson95/testaccepted/tizen_base_x_asan

This reverts commit 6b0810fe3da396c471f2f25d0f2e9b5cd6274318.

5 files changed, 5 insertions, 260 deletions

diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec
index 8b72171..bed03a1 100644
--- a/packaging/qemu-accel-aarch64.spec
+++ b/packaging/qemu-accel-aarch64.spec
@@ -86,49 +86,8 @@ ExclusiveArch:  x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
 %define         multilib 1
-%if 0%{?armv7l}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
 %endif
-%if 0%{?armv7hl}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
-%endif
-%if 0%{?aarch64}
-# 64bit guile is used for aarch64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%if 0%{?riscv64}
-# 64bit guile is used for riscv64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%else   # x86_64
-%if 0%{?aarch64}
-# 64bit guile is required for aarch64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?riscv64}
-# 64bit guile is required for riscv64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?armv7l}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%if 0%{?armv7hl}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%endif
-BuildRequires:  guile-modules
+
 %description
 This package is used in %{cross} architecture builds using qemu to speed up builds
 with native binaries.
@@ -254,7 +213,6 @@ for executable in %{emul_path}$LD \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
    %{_libdir}/{libunwind*.so*,libuuid*.so*} \
-   %{_bindir}/guile \
    %{_bindir}/localedef
 do
   binaries="$binaries $executable"
@@ -547,15 +505,6 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
 echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
-## guile acceleration
-# we need to accelerate guile build
-export GUILE_AUTO_COMPILE=0
-guile_version=$(guile --version | sed -ne '/^guile/s/.*)[[:space:]]\+//p')
-guile_build_dir=%{_builddir}/guile-${guile_version}/libguile
-mkdir -p ${buildroot_emul_path}${guile_build_dir}
-ln -sf %{emul_path}%{_bindir}/guile ${buildroot_emul_path}${guile_build_dir}/guile
-echo "%{emul_path}${guile_build_dir}/guile" >> %{_sourcedir}/all-accel.list
-
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
 cat > %{_sourcedir}/baselibs_prologue << EOF
diff --git a/packaging/qemu-accel-armv7hl.spec b/packaging/qemu-accel-armv7hl.spec
index a41d0c3..7b8d799 100644
--- a/packaging/qemu-accel-armv7hl.spec
+++ b/packaging/qemu-accel-armv7hl.spec
@@ -86,49 +86,8 @@ ExclusiveArch:  x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
 %define         multilib 1
-%if 0%{?armv7l}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
 %endif
-%if 0%{?armv7hl}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
-%endif
-%if 0%{?aarch64}
-# 64bit guile is used for aarch64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%if 0%{?riscv64}
-# 64bit guile is used for riscv64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%else   # x86_64
-%if 0%{?aarch64}
-# 64bit guile is required for aarch64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?riscv64}
-# 64bit guile is required for riscv64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?armv7l}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%if 0%{?armv7hl}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%endif
-BuildRequires:  guile-modules
+
 %description
 This package is used in %{cross} architecture builds using qemu to speed up builds
 with native binaries.
@@ -254,7 +213,6 @@ for executable in %{emul_path}$LD \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
    %{_libdir}/{libunwind*.so*,libuuid*.so*} \
-   %{_bindir}/guile \
    %{_bindir}/localedef
 do
   binaries="$binaries $executable"
@@ -547,15 +505,6 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
 echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
-## guile acceleration
-# we need to accelerate guile build
-export GUILE_AUTO_COMPILE=0
-guile_version=$(guile --version | sed -ne '/^guile/s/.*)[[:space:]]\+//p')
-guile_build_dir=%{_builddir}/guile-${guile_version}/libguile
-mkdir -p ${buildroot_emul_path}${guile_build_dir}
-ln -sf %{emul_path}%{_bindir}/guile ${buildroot_emul_path}${guile_build_dir}/guile
-echo "%{emul_path}${guile_build_dir}/guile" >> %{_sourcedir}/all-accel.list
-
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
 cat > %{_sourcedir}/baselibs_prologue << EOF
diff --git a/packaging/qemu-accel-armv7l.spec b/packaging/qemu-accel-armv7l.spec
index 7d46d86..92bbaf3 100644
--- a/packaging/qemu-accel-armv7l.spec
+++ b/packaging/qemu-accel-armv7l.spec
@@ -86,49 +86,8 @@ ExclusiveArch:  x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
 %define         multilib 1
-%if 0%{?armv7l}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
 %endif
-%if 0%{?armv7hl}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
-%endif
-%if 0%{?aarch64}
-# 64bit guile is used for aarch64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%if 0%{?riscv64}
-# 64bit guile is used for riscv64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%else   # x86_64
-%if 0%{?aarch64}
-# 64bit guile is required for aarch64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?riscv64}
-# 64bit guile is required for riscv64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?armv7l}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%if 0%{?armv7hl}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%endif
-BuildRequires:  guile-modules
+
 %description
 This package is used in %{cross} architecture builds using qemu to speed up builds
 with native binaries.
@@ -254,7 +213,6 @@ for executable in %{emul_path}$LD \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
    %{_libdir}/{libunwind*.so*,libuuid*.so*} \
-   %{_bindir}/guile \
    %{_bindir}/localedef
 do
   binaries="$binaries $executable"
@@ -547,15 +505,6 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
 echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
-## guile acceleration
-# we need to accelerate guile build
-export GUILE_AUTO_COMPILE=0
-guile_version=$(guile --version | sed -ne '/^guile/s/.*)[[:space:]]\+//p')
-guile_build_dir=%{_builddir}/guile-${guile_version}/libguile
-mkdir -p ${buildroot_emul_path}${guile_build_dir}
-ln -sf %{emul_path}%{_bindir}/guile ${buildroot_emul_path}${guile_build_dir}/guile
-echo "%{emul_path}${guile_build_dir}/guile" >> %{_sourcedir}/all-accel.list
-
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
 cat > %{_sourcedir}/baselibs_prologue << EOF
diff --git a/packaging/qemu-accel-riscv64.spec b/packaging/qemu-accel-riscv64.spec
index 69531b9..a52accc 100644
--- a/packaging/qemu-accel-riscv64.spec
+++ b/packaging/qemu-accel-riscv64.spec
@@ -86,49 +86,8 @@ ExclusiveArch:  x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
 %define         multilib 1
-%if 0%{?armv7l}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
 %endif
-%if 0%{?armv7hl}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
-%endif
-%if 0%{?aarch64}
-# 64bit guile is used for aarch64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%if 0%{?riscv64}
-# 64bit guile is used for riscv64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%else   # x86_64
-%if 0%{?aarch64}
-# 64bit guile is required for aarch64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?riscv64}
-# 64bit guile is required for riscv64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?armv7l}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%if 0%{?armv7hl}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%endif
-BuildRequires:  guile-modules
+
 %description
 This package is used in %{cross} architecture builds using qemu to speed up builds
 with native binaries.
@@ -254,7 +213,6 @@ for executable in %{emul_path}$LD \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
    %{_libdir}/{libunwind*.so*,libuuid*.so*} \
-   %{_bindir}/guile \
    %{_bindir}/localedef
 do
   binaries="$binaries $executable"
@@ -547,15 +505,6 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
 echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
-## guile acceleration
-# we need to accelerate guile build
-export GUILE_AUTO_COMPILE=0
-guile_version=$(guile --version | sed -ne '/^guile/s/.*)[[:space:]]\+//p')
-guile_build_dir=%{_builddir}/guile-${guile_version}/libguile
-mkdir -p ${buildroot_emul_path}${guile_build_dir}
-ln -sf %{emul_path}%{_bindir}/guile ${buildroot_emul_path}${guile_build_dir}/guile
-echo "%{emul_path}${guile_build_dir}/guile" >> %{_sourcedir}/all-accel.list
-
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
 cat > %{_sourcedir}/baselibs_prologue << EOF
diff --git a/packaging/qemu-accel.spec.in b/packaging/qemu-accel.spec.in
index 9ae7d29..714b99b 100644
--- a/packaging/qemu-accel.spec.in
+++ b/packaging/qemu-accel.spec.in
@@ -83,49 +83,8 @@ ExclusiveArch:  x86_64
 BuildRequires:  libgcc-32bit
 BuildRequires:  glibc-32bit
 %define         multilib 1
-%if 0%{?armv7l}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
 %endif
-%if 0%{?armv7hl}
-# 32bit guile is required for armv7l and armv7hl builds
-BuildRequires:  guile-32bit
-BuildConflicts: guile
-%endif
-%if 0%{?aarch64}
-# 64bit guile is used for aarch64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%if 0%{?riscv64}
-# 64bit guile is used for riscv64
-BuildRequires:  guile
-BuildConflicts: guile-32bit
-%endif
-%else   # x86_64
-%if 0%{?aarch64}
-# 64bit guile is required for aarch64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?riscv64}
-# 64bit guile is required for riscv64 build
-BuildRequires:  guile-64bit
-BuildConflicts: guile
-%endif
-%if 0%{?armv7l}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%if 0%{?armv7hl}
-# 32bit guile is used for armv7l and armv7hl builds
-BuildRequires:  guile
-BuildConflicts: guile-64bit
-%endif
-%endif
-BuildRequires:  guile-modules
+
 %description
 This package is used in %{cross} architecture builds using qemu to speed up builds
 with native binaries.
@@ -251,7 +210,6 @@ for executable in %{emul_path}$LD \
    %{_rpmconfigdir}/debugedit \
    %{_rpmconfigdir}/*deps \
    %{_libdir}/{libunwind*.so*,libuuid*.so*} \
-   %{_bindir}/guile \
    %{_bindir}/localedef
 do
   binaries="$binaries $executable"
@@ -544,15 +502,6 @@ echo "%{emul_path}${gcc_build_dir}/gcc/xg++" >> %{_sourcedir}/all-accel.list
 ln -sf %{emul_path}%{_bindir}/cpp ${buildroot_emul_path}/usr/lib/cpp
 echo '%{emul_path}/usr/lib/cpp' >> %{_sourcedir}/all-accel.list
 
-## guile acceleration
-# we need to accelerate guile build
-export GUILE_AUTO_COMPILE=0
-guile_version=$(guile --version | sed -ne '/^guile/s/.*)[[:space:]]\+//p')
-guile_build_dir=%{_builddir}/guile-${guile_version}/libguile
-mkdir -p ${buildroot_emul_path}${guile_build_dir}
-ln -sf %{emul_path}%{_bindir}/guile ${buildroot_emul_path}${guile_build_dir}/guile
-echo "%{emul_path}${guile_build_dir}/guile" >> %{_sourcedir}/all-accel.list
-
 # generate baselibs.conf for current architecture to prevent rpm overwriting in download repo
 echo  %{cross}
 cat > %{_sourcedir}/baselibs_prologue << EOF