From 4b8719c1cdc6ac6bd1aac9d9773a71c4ad9e9d1b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 8 Feb 2018 15:19:32 +0000
Subject: [PATCH] MJIT header for multiarch

* configure.ac: MJIT_HEADER_INSTALL_DIR to rubyarchhdrdir to
  support multiarch.

* Makefile.in (MJIT_HEADER_INSTALL_DIR): configured by multiarch.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 Makefile.in             | 2 ++
 common.mk               | 1 -
 configure.ac            | 4 ++++
 template/verconf.h.tmpl | 2 +-
 win32/Makefile.sub      | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 62d24e5476..d9cf3bea11 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45,6 +45,7 @@ sitearch = @sitearch@
 sitedir = @sitedir@
 archlibdir = @archlibdir@
 ruby_version = @ruby_version@
+RUBY_VERSION_NAME = @RUBY_VERSION_NAME@
 
 TESTUI = console
 TESTS =
@@ -73,6 +74,7 @@ CPPFLAGS = @CPPFLAGS@ $(INCFLAGS)
 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)
diff --git a/common.mk b/common.mk
index 837825df57..cf9401bf73 100644
--- a/common.mk
+++ b/common.mk
@@ -64,7 +64,6 @@ MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/rb_mjit_min_header-$(RUBY_PROGRAM_VER
 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)
diff --git a/configure.ac b/configure.ac
index 02b334566b..800e44ae89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2478,6 +2478,7 @@ LIBEXT=a
 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,
 	      [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}'
diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl
index 3b8a8aad76..9ba2bd6de5 100644
--- a/template/verconf.h.tmpl
+++ b/template/verconf.h.tmpl
@@ -4,7 +4,7 @@
 % 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"]
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 4e143af419..d82007f5c7 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -289,6 +289,7 @@ CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS)
 MJIT_HEADER_FLAGS = -P
 MJIT_HEADER_SUFFIX =
 MJIT_HEADER_ARCH =
+MJIT_HEADER_INSTALL_DIR = include/$(RUBY_VERSION_NAME)/$(arch)
 
 DLDFLAGS = $(LDFLAGS) -dll
 SOLIBS =