From 89fd9797736528cfb1e7ea0c1c2473ffd0db9980 Mon Sep 17 00:00:00 2001 From: Dongkyun Son Date: Thu, 18 Apr 2024 13:01:11 +0900 Subject: Revert "Add guile acceleration support" This reverts commit 6b0810fe3da396c471f2f25d0f2e9b5cd6274318. --- packaging/qemu-accel-aarch64.spec | 43 +-------------------------------------- packaging/qemu-accel-armv7hl.spec | 43 +-------------------------------------- packaging/qemu-accel-armv7l.spec | 43 +-------------------------------------- packaging/qemu-accel.spec.in | 43 +-------------------------------------- 4 files changed, 4 insertions(+), 168 deletions(-) diff --git a/packaging/qemu-accel-aarch64.spec b/packaging/qemu-accel-aarch64.spec index 13c1601..9257fd3 100644 --- a/packaging/qemu-accel-aarch64.spec +++ b/packaging/qemu-accel-aarch64.spec @@ -83,39 +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 -%else # x86_64 -%if 0%{?aarch64} -# 64bit guile is required for aarch64 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. @@ -241,7 +210,6 @@ for executable in $LD \ %{_rpmconfigdir}/debugedit \ %{_rpmconfigdir}/*deps \ %{_libdir}/{libunwind*.so*,libuuid*.so*} \ - %{_bindir}/guile \ %{_bindir}/localedef do binaries="$binaries $executable" @@ -524,15 +492,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 3128c03..c3bb2de 100644 --- a/packaging/qemu-accel-armv7hl.spec +++ b/packaging/qemu-accel-armv7hl.spec @@ -83,39 +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 -%else # x86_64 -%if 0%{?aarch64} -# 64bit guile is required for aarch64 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. @@ -241,7 +210,6 @@ for executable in $LD \ %{_rpmconfigdir}/debugedit \ %{_rpmconfigdir}/*deps \ %{_libdir}/{libunwind*.so*,libuuid*.so*} \ - %{_bindir}/guile \ %{_bindir}/localedef do binaries="$binaries $executable" @@ -524,15 +492,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 da6f971..7965907 100644 --- a/packaging/qemu-accel-armv7l.spec +++ b/packaging/qemu-accel-armv7l.spec @@ -83,39 +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 -%else # x86_64 -%if 0%{?aarch64} -# 64bit guile is required for aarch64 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. @@ -241,7 +210,6 @@ for executable in $LD \ %{_rpmconfigdir}/debugedit \ %{_rpmconfigdir}/*deps \ %{_libdir}/{libunwind*.so*,libuuid*.so*} \ - %{_bindir}/guile \ %{_bindir}/localedef do binaries="$binaries $executable" @@ -524,15 +492,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 7b360a7..cd9e726 100644 --- a/packaging/qemu-accel.spec.in +++ b/packaging/qemu-accel.spec.in @@ -80,39 +80,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 -%else # x86_64 -%if 0%{?aarch64} -# 64bit guile is required for aarch64 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. @@ -238,7 +207,6 @@ for executable in $LD \ %{_rpmconfigdir}/debugedit \ %{_rpmconfigdir}/*deps \ %{_libdir}/{libunwind*.so*,libuuid*.so*} \ - %{_bindir}/guile \ %{_bindir}/localedef do binaries="$binaries $executable" @@ -521,15 +489,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 -- cgit v1.2.3