Skip to content

Commit d217b71

Browse files
committed
centos7: use _python_bytecompile_errors_terminate_build for bytecompile error
Signed-off-by: Shizuo Fujita <[email protected]>
1 parent 9846c05 commit d217b71

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

fluent-package/yum/fluent-package.spec.in

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,8 @@
3636
%define install_plugins /tmp/@PACKAGE_DIR@/.install_plugins
3737
%define pid_for_auto_restart /tmp/@PACKAGE_DIR@/.pid_for_auto_restart
3838

39-
# Disable to use old python on CentOS 7 because it causes error in brp-python-bytecompile.
40-
# We can use __brp_python_bytecompile to disable it with rpm 4.14.2+ environment,
41-
# but CentOS 7 has rpm 4.11.3 which does not support it.
42-
%if %{_centos_ver} == 7
43-
%global __python %{nil}
44-
%endif
45-
46-
# Omit the brp-python-bytecompile automagic because post hook for ffi fails on AmazonLinux 2.
47-
%if %{_amazon_ver} == 2
48-
%global __brp_python_bytecompile %{nil}
49-
%endif
39+
# Stop interrupting by bytecopile errors. The errors are causes on Amazon Linux 2 and CentOS 7.
40+
%global _python_bytecompile_errors_terminate_build 0
5041

5142
%global __provides_exclude_from ^/opt/%{name}/.*\\.so.*
5243
%global __requires_exclude libjemalloc.*|libruby.*|/opt/%{name}/.*

0 commit comments

Comments
 (0)