Disable colorized ./configure
Due to missing macro AS_FUNCTION_DESCRIBE in Autoconf
This commit is contained in:
parent
7d291cb3c5
commit
9fd772dd06
|
@ -0,0 +1,26 @@
|
||||||
|
From 9806021813c9dde4747b0bd6f0ed24bdeede0a4a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Pavel Valena <pvalena@redhat.com>
|
||||||
|
Date: Fri, 15 Jul 2016 13:52:31 +0200
|
||||||
|
Subject: [PATCH] Disable colorized ./configure
|
||||||
|
|
||||||
|
Missing macro AS_FUNCTION_DESCRIBE in Autoconf
|
||||||
|
---
|
||||||
|
Makefile.in | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Makefile.in b/Makefile.in
|
||||||
|
index 76b61f5..2432884 100644
|
||||||
|
--- a/Makefile.in
|
||||||
|
+++ b/Makefile.in
|
||||||
|
@@ -307,7 +307,7 @@ reconfig config.status: $(srcdir)/$(CONFIGURE) $(srcdir)/enc/Makefile.in \
|
||||||
|
@PWD= MINIRUBY="$(MINIRUBY)"; export MINIRUBY; \
|
||||||
|
set $(SHELL) $($@-args); $(reconfig-exec-$(V))
|
||||||
|
|
||||||
|
-$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in $(srcdir)/aclocal.m4
|
||||||
|
+$(srcdir)/$(CONFIGURE): $(srcdir)/configure.in
|
||||||
|
$(CHDIR) $(srcdir) && exec $(AUTOCONF) -o $(@F)
|
||||||
|
|
||||||
|
incs: id.h
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
|
@ -129,6 +129,9 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch
|
||||||
# https://bugs.ruby-lang.org/issues/11962
|
# https://bugs.ruby-lang.org/issues/11962
|
||||||
# https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/53455
|
# https://bugs.ruby-lang.org/projects/ruby-trunk/repository/revisions/53455
|
||||||
Patch8: ruby-2.3.0-undef-BUILTIN_CHOOSE_EXPR_CONSTANT_P.patch
|
Patch8: ruby-2.3.0-undef-BUILTIN_CHOOSE_EXPR_CONSTANT_P.patch
|
||||||
|
# Disable colorized ./configure due to missing macro AS_FUNCTION_DESCRIBE in Autoconf
|
||||||
|
# http://git.savannah.gnu.org/cgit/autoconf.git/tree/lib/m4sugar/m4sh.m4?id=d99fef0e1e8e7a4c04b97fc4c6e0ffb01463622c
|
||||||
|
Patch9: ruby-2.3.0-Disable-colorized-configure.patch
|
||||||
|
|
||||||
Requires: %{?scl_prefix}%{pkg_name}-libs%{?_isa} = %{version}-%{release}
|
Requires: %{?scl_prefix}%{pkg_name}-libs%{?_isa} = %{version}-%{release}
|
||||||
Requires: %{?scl_prefix}ruby(rubygems) >= %{rubygems_version}
|
Requires: %{?scl_prefix}ruby(rubygems) >= %{rubygems_version}
|
||||||
|
@ -464,6 +467,7 @@ rm -rf ext/fiddle/libffi*
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
# Allow to use autoconf 2.63.
|
# Allow to use autoconf 2.63.
|
||||||
sed -i '/AC_PREREQ/ s/(.*)/(2.62)/' configure.in
|
sed -i '/AC_PREREQ/ s/(.*)/(2.62)/' configure.in
|
||||||
|
@ -476,6 +480,9 @@ cp -a %{SOURCE3} .
|
||||||
# https://github.com/ruby/ruby/blob/trunk/tool/compile_prelude.rb#L26
|
# https://github.com/ruby/ruby/blob/trunk/tool/compile_prelude.rb#L26
|
||||||
cp -a %{SOURCE6} .
|
cp -a %{SOURCE6} .
|
||||||
|
|
||||||
|
# Disable colorized ./configure
|
||||||
|
rm aclocal.m4
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoconf
|
autoconf
|
||||||
|
|
||||||
|
@ -957,7 +964,7 @@ TZ=UTC make check TESTS="-v $DISABLE_TESTS"
|
||||||
%{ruby_libdir}/tkextlib
|
%{ruby_libdir}/tkextlib
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Apr 13 2016 Pavel Valena <pvalena@redhat.com>
|
* Wed Apr 13 2016 Pavel Valena <pvalena@redhat.com> - 2.3.0-60
|
||||||
- Fix ruby lib path in macros.ruby.rh-ruby23
|
- Fix ruby lib path in macros.ruby.rh-ruby23
|
||||||
- Resolves: rhbz#1255753
|
- Resolves: rhbz#1255753
|
||||||
- Manually set UTC timezone for tests
|
- Manually set UTC timezone for tests
|
||||||
|
|
Loading…
Reference in New Issue