nobu	2018-02-09 00:19:32 +0900 (Fri, 09 Feb 2018)

  New Revision: 62320

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62320

  Log:
    MJIT header for multiarch
    
    * configure.ac: MJIT_HEADER_INSTALL_DIR to rubyarchhdrdir to
      support multiarch.
    
    * Makefile.in (MJIT_HEADER_INSTALL_DIR): configured by multiarch.

  Modified files:
    trunk/Makefile.in
    trunk/common.mk
    trunk/configure.ac
    trunk/template/verconf.h.tmpl
    trunk/win32/Makefile.sub
Index: configure.ac
===================================================================
--- configure.ac	(revision 62319)
+++ configure.ac	(revision 62320)
@@ -2478,6 +2478,7 @@ LIBEXT=a https://github.com/ruby/ruby/blob/trunk/configure.ac#L2478
 AC_SUBST(DLDFLAGS)dnl
 AC_SUBST(ARCH_FLAG)dnl
 AC_SUBST(MJIT_HEADER_FLAGS)dnl
+AC_SUBST(MJIT_HEADER_INSTALL_DIR)dnl
 
 AC_SUBST(STATIC)dnl
 AC_SUBST(CCDLFLAGS)dnl
@@ -2966,6 +2967,9 @@ AC_ARG_ENABLE(multiarch, https://github.com/ruby/ruby/blob/trunk/configure.ac#L2967
 	      [multiarch=], [unset multiarch])
 AS_IF([test ${multiarch+set}], [
    AC_DEFINE(ENABLE_MULTIARCH)
+   MJIT_HEADER_INSTALL_DIR=include/'${arch}/${RUBY_VERSION_NAME}'
+], [
+   MJIT_HEADER_INSTALL_DIR=include/'${RUBY_VERSION_NAME}/${arch}'
 ])
 
 archlibdir='${libdir}/${arch}'
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 62319)
+++ Makefile.in	(revision 62320)
@@ -45,6 +45,7 @@ sitearch = @sitearch@ https://github.com/ruby/ruby/blob/trunk/Makefile.in#L45
 sitedir = @sitedir@
 archlibdir = @archlibdir@
 ruby_version = @ruby_version@
+RUBY_VERSION_NAME = @RUBY_VERSION_NAME@
 
 TESTUI = console
 TESTS =
@@ -73,6 +74,7 @@ CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L74
 MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
+MJIT_HEADER_INSTALL_DIR = @MJIT_HEADER_INSTALL_DIR@
 LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
 EXTLDFLAGS = @EXTLDFLAGS@
 XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)
Index: common.mk
===================================================================
--- common.mk	(revision 62319)
+++ common.mk	(revision 62320)
@@ -64,7 +64,6 @@ MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DI https://github.com/ruby/ruby/blob/trunk/common.mk#L64
 MJIT_CPPFLAGS = -DMJIT_HEADER_INSTALL_DIR=\""$(MJIT_HEADER_INSTALL_DIR)"\" \
 		-DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\"
 MJIT_HEADER_BUILD_DIR = $(EXTOUT)/include/$(arch)
-MJIT_HEADER_INSTALL_DIR = include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)
 
 INITOBJS      = dmyext.$(OBJEXT) dmyenc.$(OBJEXT)
 NORMALMAINOBJ = main.$(OBJEXT)
Index: template/verconf.h.tmpl
===================================================================
--- template/verconf.h.tmpl	(revision 62319)
+++ template/verconf.h.tmpl	(revision 62320)
@@ -4,7 +4,7 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.tmpl#L4
 % C = rbconfig::MAKEFILE_CONFIG.dup
 % def C.[](name) str = super and (str unless str.empty?); end
 #define RUBY_BASE_NAME			"${RUBY_BASE_NAME}"
-#define RUBY_VERSION_NAME		RUBY_BASE_NAME"-"RUBY_LIB_VERSION
+#define RUBY_VERSION_NAME		"${RUBY_VERSION_NAME}"
 % if C["RUBY_LIB_VERSION_STYLE"]
 #define RUBY_LIB_VERSION_STYLE		${RUBY_LIB_VERSION_STYLE}
 % elsif !C["RUBY_LIB_VERSION"]
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 62319)
+++ win32/Makefile.sub	(revision 62320)
@@ -289,6 +289,7 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAG https://github.com/ruby/ruby/blob/trunk/win32/Makefile.sub#L289
 MJIT_HEADER_FLAGS = -P
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
+MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch)
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS =

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/