ruby-changes:65653
From: Nobuyoshi <ko1@a...>
Date: Thu, 25 Mar 2021 17:13:06 +0900 (JST)
Subject: [ruby-changes:65653] e7dc6f2a3c (master): Generate encoding header before enc.mk
https://git.ruby-lang.org/ruby.git/commit/?id=e7dc6f2a3c From e7dc6f2a3cee7e64272988e23e6eb3a4b03a1608 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Thu, 25 Mar 2021 17:01:50 +0900 Subject: Generate encoding header before enc.mk As some encodings need the corresponding header. --- common.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common.mk b/common.mk index 98e1902..f3df20d 100644 --- a/common.mk +++ b/common.mk @@ -858,9 +858,10 @@ encs enc trans libencs libenc libtrans: $(SHOWFLAGS) $(ENC_MK) $(LIBRUBY) $(PREP https://github.com/ruby/ruby/blob/trunk/common.mk#L858 libenc enc: {$(VPATH)}encdb.h libtrans trans: {$(VPATH)}transdb.h +ENC_HEADERS = $(srcdir)/enc/jis/props.h # Use MINIRUBY which loads fake.rb for cross compiling $(ENC_MK): $(srcdir)/enc/make_encmake.rb $(srcdir)/enc/Makefile.in $(srcdir)/enc/depend \ - $(srcdir)/enc/encinit.c.erb $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake + $(srcdir)/enc/encinit.c.erb $(ENC_HEADERS) $(srcdir)/lib/mkmf.rb $(RBCONFIG) fake $(ECHO) generating $@ $(Q) $(MINIRUBY) $(srcdir)/enc/make_encmake.rb --builtin-encs="$(BUILTIN_ENCOBJS)" --builtin-transes="$(BUILTIN_TRANSOBJS)" --module$(ENCSTATIC) $(ENCS) $@ @@ -1074,7 +1075,7 @@ all-incs: incs {$(VPATH)}encdb.h {$(VPATH)}transdb.h https://github.com/ruby/ruby/blob/trunk/common.mk#L1075 incs: $(INSNS) {$(VPATH)}node_name.inc {$(VPATH)}known_errors.inc \ {$(VPATH)}vm_call_iseq_optimized.inc $(srcdir)/revision.h \ $(REVISION_H) \ - $(UNICODE_DATA_HEADERS) $(srcdir)/enc/jis/props.h \ + $(UNICODE_DATA_HEADERS) $(ENC_HEADERS) \ {$(VPATH)}id.h {$(VPATH)}probes.dmyh insns: $(INSNS) -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/