diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-06 05:46:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-06 05:46:43 +0000 |
| commit | 8d004969118b06d0057841f2e89ddfd0807ad765 (patch) | |
| tree | 2dd1b7c6bf71c6491e711e99c12f1f691509f0e6 | |
| parent | c9e8dd082e6dc1ee337f99be3fd828be86d5ed4f (diff) | |
Revert r48278 "common.mk: update unicode data only if BASERUBY is available"
Moreover its error "make[1]: *** No rule to make target
`lib/unicode_normalize/tables.rb', needed by `srcs-lib'. Stop." is not
a good error message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | win32/setup.mak | 7 |
5 files changed, 1 insertions, 18 deletions
@@ -52,12 +52,6 @@ Wed Nov 5 15:05:12 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> NUL-terminate the result string, in the future, so it will not be needed in other cases. -Wed Nov 5 14:11:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * common.mk (lib/unicode_normalize/tables.rb): do nothing unless - BASERUBY is available. MINIRUBY cannot load extension libraries, - so cannot update Unicode data. - Wed Nov 5 12:13:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by diff --git a/Makefile.in b/Makefile.in index 0b96347e3d..39fe0bb37f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,7 +25,6 @@ AUTOCONF = autoconf @SET_MAKE@ MKFILES = @MAKEFILES@ BASERUBY = @BASERUBY@ -HAVE_BASERUBY = @HAVE_BASERUBY@ TEST_RUNNABLE = @TEST_RUNNABLE@ CROSS_COMPILING = @CROSS_COMPILING@ DOXYGEN = @DOXYGEN@ @@ -1124,7 +1124,7 @@ download-unicode-data: ./.unicode-$(UNICODE_VERSION).time $(UNICODE_VERSION)/ucd/NormalizationTest.txt @exit > $@ -$(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): ./.unicode-tables.time +$(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time ./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ $(UNICODE_FILES) $(UNICODE_FILES_DEPS) \ diff --git a/configure.in b/configure.in index 6ac18b8d10..c6504ba112 100644 --- a/configure.in +++ b/configure.in @@ -46,13 +46,10 @@ if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then BASERUBY="$BASERUBY --disable=gems" fi $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub - HAVE_BASERUBY=yes else BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" - HAVE_BASERUBY=no fi AC_SUBST(BASERUBY) -AC_SUBST(HAVE_BASERUBY) AC_DEFUN([RUBY_MINGW32], [AS_CASE(["$host_os"], diff --git a/win32/setup.mak b/win32/setup.mak index f00418e864..f64d24d331 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -66,14 +66,7 @@ USE_RUBYGEMS = $(USE_RUBYGEMS) @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE) @echo !if "$$(BASERUBY)" == "">> $(MAKEFILE) @echo BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 >> $(MAKEFILE) - @echo HAVE_BASERUBY = no>> $(MAKEFILE) - @echo !else>> $(MAKEFILE) - @echo HAVE_BASERUBY = yes>> $(MAKEFILE) @echo !endif>> $(MAKEFILE) -!elseif [$(BASERUBY) -eexit 2> nul] == 0 - @echo HAVE_BASERUBY = yes>> $(MAKEFILE) -!else - @echo HAVE_BASERUBY = no>> $(MAKEFILE) !endif -system-vars-: -osname- -runtime- -headers- |