ruby-changes:56038
From: Nobuyoshi <ko1@a...>
Date: Fri, 7 Jun 2019 09:06:26 +0900 (JST)
Subject: [ruby-changes:56038] Nobuyoshi Nakada: 200c840b95 (trunk): Revert "Moved Makefile.in under template"
https://git.ruby-lang.org/ruby.git/commit/?id=200c840b95 From 200c840b952a65fca10d5f3a47b69288f1d3dc65 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Fri, 7 Jun 2019 09:02:48 +0900 Subject: Revert "Moved Makefile.in under template" This reverts commits: * 6f9d5fafe040cb02a1278fbfcdcb8063d564824c * bb3c89b6437049e26669b2156310670d5e06e386 And remove the dependency of Makefile on Makefile.in transitionally. diff --git a/.travis.yml b/.travis.yml index 17eec60..4143def 100644 --- a/.travis.yml +++ b/.travis.yml @@ -370,7 +370,7 @@ before_script: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L370 - ln -s ~/.downloaded-cache - "> config.status" - "> .rbconfig.time" - - sed -f tool/prereq.status template/Makefile.in common.mk > Makefile + - sed -f tool/prereq.status Makefile.in common.mk > Makefile - make touch-unicode-files - make -s $JOBS $UPDATE_UNICODE up - make -s $JOBS srcs diff --git a/Makefile.in b/Makefile.in new file mode 100644 index 0000000..1cac12a --- /dev/null +++ b/Makefile.in @@ -0,0 +1,646 @@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L1 +# -*- mode: makefile-gmake; indent-tabs-mode: t -*- + +SHELL = /bin/sh +NULLCMD = @NULLCMD@ +n=$(NULLCMD) +ECHO1 = $(V:1=$n) +RUNCMD = $(SHELL) +CDPATH = . +CHDIR = @CHDIR@ +exec = exec +NULL = /dev/null +PATH_SEPARATOR = @PATH_SEPARATOR@ + +#### Start of system configuration section. #### + +srcdir = @srcdir@ +top_srcdir = $(srcdir) +hdrdir = $(srcdir)/include +PLATFORM_DIR = @PLATFORM_DIR@ + +CC_WRAPPER = @XCC_WRAPPER@ +CC = @CC@ +CPP = @CPP@ +LD = @LD@ +YACC = bison +PURIFY = +AUTOCONF = autoconf +ACLOCAL = aclocal +CONFIGURE = @CONFIGURE@ +@SET_MAKE@ +MKFILES = @MAKEFILES@ +BASERUBY = @BASERUBY@ +HAVE_BASERUBY = @HAVE_BASERUBY@ +TEST_RUNNABLE = @TEST_RUNNABLE@ +CROSS_COMPILING = @CROSS_COMPILING@ +DOXYGEN = @DOXYGEN@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +bindir = @bindir@ +sbindir = @sbindir@ +libdir = @libdir@ +libexecdir = @libexecdir@ +datarootdir = @datarootdir@ +datadir = @datadir@ +arch = @arch@ +sitearch = @sitearch@ +sitedir = @sitedir@ +archlibdir = @archlibdir@ +includedir = @includedir@ +archincludedir = @archincludedir@ +rubylibprefix = @rubylibprefix@ +rubylibdir = @rubylibdir@ +rubyarchprefix = @rubyarchprefix@ +rubyarchdir = @rubyarchdir@ +rubyhdrdir = @rubyhdrdir@ +rubyarchhdrdir = @rubyarchhdrdir@ +ruby_version = @ruby_version@ +RUBY_VERSION_NAME = @RUBY_VERSION_NAME@ +UNIVERSAL_ARCHNAMES = @UNIVERSAL_ARCHNAMES@ + +TESTUI = console +TESTS = +INSTALLDOC = @INSTALLDOC@ +DOCTARGETS = @RDOCTARGET@ @CAPITARGET@ + +EXTOUT = @EXTOUT@ +TIMESTAMPDIR = $(EXTOUT)/.timestamp +arch_hdrdir = $(EXTOUT)/include/$(arch) +VPATH = $(arch_hdrdir)/ruby:$(hdrdir)/ruby:$(srcdir):$(srcdir)/missing + +empty = +CC_VERSION = @CC_VERSION@ +OUTFLAG = @OUTFLAG@$(empty) +COUTFLAG = @COUTFLAG@$(empty) +CPPOUTFLAG = $(COUTFLAG) +ARCH_FLAG = @ARCH_FLAG@ +CFLAGS_NO_ARCH = @CFLAGS@ +CFLAGS = $(CFLAGS_NO_ARCH) $(ARCH_FLAG) +cflags = @cflags@ +optflags = @optflags@ +debugflags = @debugflags@ +warnflags = @warnflags@ @strict_warnflags@ +cppflags = @cppflags@ +MATHN = @MATHN@ +XCFLAGS = @XCFLAGS@ $(MATHN:yes=-DCANONICALIZATION_FOR_MATHN) +USE_RUBYGEMS = @USE_RUBYGEMS@ +USE_RUBYGEMS_ = $(USE_RUBYGEMS:yes=) +CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) $(USE_RUBYGEMS_:no=-DDISABLE_RUBYGEMS=1) +MJIT_SUPPORT = @MJIT_SUPPORT@ +MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@ +MJIT_HEADER_SUFFIX = +MJIT_HEADER_ARCH = +MJIT_HEADER_INSTALL_DIR = @MJIT_HEADER_INSTALL_DIR@ +MJIT_CC = @MJIT_CC@ +MJIT_CFLAGS = @MJIT_CFLAGS@ +MJIT_OPTFLAGS = @MJIT_OPTFLAGS@ +MJIT_DEBUGFLAGS = @MJIT_DEBUGFLAGS@ +MJIT_LDSHARED = @MJIT_LDSHARED@ +MJIT_DLDFLAGS = @DLDFLAGS@ +MJIT_HEADER = rb_mjit_header.h +MJIT_MIN_HEADER_NAME = rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h +MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/$(MJIT_MIN_HEADER_NAME) +MJIT_HEADER_BUILD_DIR = $(EXTOUT)/include/$(arch) +LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ +EXTLDFLAGS = @EXTLDFLAGS@ +XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS) +EXTLIBS = +LIBS = @LIBS@ $(EXTLIBS) +MISSING = @LIBOBJS@ @ALLOCA@ +ENABLE_SHARED = @ENABLE_SHARED@ +LDSHARED = @LIBRUBY_LDSHARED@ +DLDSHARED = @DLDSHARED@ +DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) +SOLIBS = @SOLIBS@ +ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ +MAINLIBS = @MAINLIBS@ +ARCHMINIOBJS = @MINIOBJS@ +DLNOBJ = @DLNOBJ@ +ENCOBJS = @ENCOBJS@ +EXTOBJS = @EXTOBJS@ +BUILTIN_ENCOBJS = @BUILTIN_ENCOBJS@ +BUILTIN_TRANSSRCS = @BUILTIN_TRANSSRCS@ +BUILTIN_TRANSOBJS = @BUILTIN_TRANSOBJS@ +POSTLINK = @POSTLINK@ + +RUBY_BASE_NAME=@RUBY_BASE_NAME@ +RUBY_API_VERSION=@RUBY_API_VERSION@ +RUBY_INSTALL_NAME=@RUBY_INSTALL_NAME@ +RUBY_SO_NAME=@RUBY_SO_NAME@ +EXEEXT = @EXEEXT@ +LIBEXT = @LIBEXT@ +PROGRAM=$(RUBY_INSTALL_NAME)$(EXEEXT) +RUBY = $(RUBY_INSTALL_NAME) +MINIRUBY = @MINIRUBY@\ + $(MINIRUBYOPT) +# RUNRUBY_COMMAND:: runruby.rb or baseruby. do not append options directly +RUNRUBY_COMMAND = @RUNRUBY_COMMAND@ +# RUNRUBY:: run ruby with RUN_OPTS which is passed to ruby +RUNRUBY = @RUNRUBY@ $(RUN_OPTS) +# RUNRUBY_DEBUGGER:: debugging option for runruby.rb +RUNRUBY_DEBUGGER = --debugger='gdb -x run.gdb --quiet --args' +XRUBY = @XRUBY@ +BTESTRUBY = @BTESTRUBY@\ + $(MINIRUBYOPT) +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +XRUBY_LIBDIR = @XRUBY_LIBDIR@ +XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ +XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ +BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ + +COROUTINE_H = @X_FIBER_COROUTINE_H@ +COROUTINE_OBJ = $(COROUTINE_H:.h=.@OBJEXT@) + +#### End of system configuration section. #### + +MAJOR= @MAJOR@ +MINOR= @MINOR@ +TEENY= @TEENY@ + +# here for MJIT_MIN_HEADER_NAME, not in common.mk +RUBY_PROGRAM_VERSION = $(MAJOR).$(MINOR).$(TEENY) + +LIBRUBY_A = @LIBRUBY_A@ +LIBRUBY_SO = @LIBRUBY_SO@ +LIBRUBY_SONAME= @LIBRUBY_SONAME@ +LIBRUBY_ALIASES= @LIBRUBY_ALIASES@ +LIBRUBY = @LIBRUBY@ +LIBRUBYARG = @LIBRUBYARG@ +LIBRUBYARG_STATIC = @LIBRUBYARG_STATIC@ +LIBRUBYARG_SHARED = @LIBRUBYARG_SHARED@ +LIBRUBY_RELATIVE = @LIBRUBY_RELATIVE@ +LIBRUBY_A_OBJS = @LIBRUBY_A_OBJS@ + +DTRACE_REBUILD_OBJS = $(DTRACE_REBUILD:yes=$(DTRACE_DEPENDENT_OBJS)) + +DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \ + eval.$(OBJEXT) \ + gc.$(OBJEXT) \ + hash.$(OBJEXT) \ + load.$(OBJEXT) \ + object.$(OBJEXT) \ + parse.$(OBJEXT) \ + string.$(OBJEXT) \ + symbol.$(OBJEXT) \ + vm.$(OBJEXT) + +THREAD_MODEL = @THREAD_MODEL@ + +PREP = @PREP@ +ARCHFILE = @ARCHFILE@ +SETUP = +EXTSTATIC = @EXTSTATIC@ +ENCSTATIC = @ENCSTATIC@ +SET_LC_MESSAGES = env LC_MESSAGES=C + +MAKEDIRS = @MKDIR_P@ +CP = cp +MV = mv +RM = rm -f +RMDIR = @RMDIR@ +RMDIRS = @RMDIRS@ +RMALL = @RMALL@ +NM = @NM@ +AR = @AR@ +ARFLAGS = @ARFLAGS@$(empty) +RANLIB = @RANLIB@ +AS = @AS@ +ASFLAGS = @ASFLAGS@ $(INCFLAGS) +IFCHANGE = $(srcdir)/tool/ifchange +OBJDUMP = @OBJDUMP@ +OBJCOPY = @OBJCOPY@ +HAVE_GIT = @HAVE_GIT@ +GIT = @GIT@ +VCS = @VCS@ +VCSUP = @VCSUP@ +DTRACE = @DTRACE@ @DTRACE_OPT@ +DTRACE_EXT = @DTRACE_EXT@ +DTRACE_OBJ = @DTRACE_OBJ@ +DTRACE_REBUILD= @DTRACE_REBUILD@ +DTRACE_GLOMMED_OBJ = $(DTRACE_REBUILD:yes=ruby-glommed.$(OBJEXT)) + +OBJEXT = @OBJEXT@ +ASMEXT = S +SOEXT = @SOEXT@ +DLEXT = @DLEXT@ +MANTYPE = @MANTYPE@ +SYMBOL_PREFIX = @SYMBOL_PREFIX@ + +INSTALLED_LIST= .installed.list + +NEWLINE_C = enc/trans/newline.c +MINIPRELUDE_C = miniprelude.c +PRELUDE_C = prelude.c +GOLF_PRELUDE_C= golf_prelude.c +RBCONFIG = .rbconfig.time + +MAINSRC = $(MAINOBJ:@OBJEXT@=c) + +SRC_FILE = $< +OS_SRC_FILE = $< +DEST_FILE = $@ +OS_DEST_FILE = $@ + +MESSAGE_BEGIN = @for line in +MESSAGE_END = ; do echo "$$line"; done +ECHO_BEGIN = @sep=''; for word in +ECHO_END = ; do echo @ECHO_N@ "$$sep'$$word'@ECHO_C@"; sep=' '; done; echo + +DESTDIR = @DESTDIR@ + +configure_args = @configure_args@ +#### End of variables + +.SUFFIXES: .inc .h .c .y .i .$(ASMEXT) .$(DTRACE_EXT) + +all: + +# Prevent GNU make v3 from overflowing arg limit on SysV. +.NOEXPORT: + +miniruby$(EXEEXT): + @-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi + $(ECHO) linking $@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(MAINLIBS) $(LIBS) $(OUTFLAG)$@ + $(Q) $(POSTLINK) + +$(PROGRAM): + @$(RM) $@ + $(ECHO) linking $@ + $(Q) $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(EXTOBJS) $(LIBRUBYARG) $(MAINLIBS) $(LIBS) $(EXTLIBS) $(OUTFLAG)$@ + $(Q) $(POSTLINK) + +PRE_LIBRUBY_UPDATE = [ -n "$(LIBRUBY_SO_UPDATE)" ] || $(exec) $(RM) $(LIBRUBY_EXTS) + +# We must `rm' the library each time this rule is invoked because "updating" a +# MAB library on Apple/NeXT (see --enable-fat-binary in configure) is not +# supported. +$(LIBRUBY_A): + @$(RM) $@ + @-[ -z "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE) + $(ECHO) linking static-library $@ + $(Q) $(AR) $(ARFLAGS) $@ $(LIBRUBY_A_OBJS) $(INITOBJS) + @-$(RANLIB) $@ 2> /dev/null || true + +verify-static-library: $(LIBRUBY_A) + $(ECHO) verifying static-library $@ + @$(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINOBJ) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)conftest$(EXEEXT) + @$(RMALL) conftest$(EXEEXT) conftest.c conftest.dSYM + +$(LIBRUBY_SO): + @-[ -n "$(EXTSTATIC)" ] || $(PRE_LIBRUBY_UPDATE) + $(ECHO) linking shared-library $@ + $(Q) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(EXTSOLIBS) $(OUTFLAG)$@ + -$(Q) $(OBJCOPY) -w -L '$(SYMBOL_PREFIX)Init_*' -L '$(SYMBOL_PREFIX)ruby_static_id_*' \ + -L '$(SYMBOL_PREFIX)*_threadptr_*' -L '$(SYMBOL_PREFIX)*_ec_*' $@ + $(Q) $(POSTLINK) + @-$(MINIRUBY) -e 'so, *aliases = ARGV; aliases.uniq!; aliases.delete(File.basename(so)); \ + aliases.each { |link| File.delete link rescue nil; File.symlink so, link }' \ + $(LIBRUBY_SO) $(LIBRUBY_ALIASES) || true + +LIBRUBY_WITH_EXT = @LIBRUBY_WITH_EXT@ +$(LIBRUBY_ (... truncated) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/