ruby-changes:62664
From: =E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3 <ko1@a...>
Date: Fri, 21 Aug 2020 11:05:11 +0900 (JST)
Subject: [ruby-changes:62664] 7341b1a53d (master): configure.ac: move program_transform_name
https://git.ruby-lang.org/ruby.git/commit/?id=7341b1a53d From 7341b1a53d868c3250b4c4699619ac369cd5d9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=9C=E9=83=A8=E6=98=8C=E5=B9=B3?= <shyouhei@r...> Date: Thu, 20 Aug 2020 10:19:13 +0900 Subject: configure.ac: move program_transform_name Historically `$program_transform_name` has been put in front of `AC_CANONICAL_TARGET`. Previous commit changes it, which affects the name of generated ruby binary when cross-compiling. I _guess_ the historical behaviour is a bug (name of ruby binary shall honour --target configure option I think), but anyways here I preserve that questionable way. diff --git a/configure.ac b/configure.ac index b46d73f..7a56514 100644 --- a/configure.ac +++ b/configure.ac @@ -71,10 +71,23 @@ AC_SUBST(TEENY) https://github.com/ruby/ruby/blob/trunk/configure.ac#L71 AC_SUBST(RUBY_API_VERSION, '$(MAJOR).$(MINOR)') AC_SUBST(RUBY_PROGRAM_VERSION, '$(MAJOR).$(MINOR).$(TEENY)') +AS_IF([test "$program_prefix" = NONE], [ + program_prefix= +]) +AS_IF([test "$prefix" -ef .], [ + AC_MSG_ERROR(--prefix cannot be the current working directory.) +]) +RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` +RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"` +AC_SUBST(RUBY_BASE_NAME) +AC_SUBST(RUBYW_BASE_NAME) +AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}') + dnl checks for alternative programs AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET +AC_ARG_PROGRAM RUBY_RM_RECURSIVE AC_ARG_WITH(gcc, AS_HELP_STRING([--without-gcc], [never use gcc]), @@ -177,18 +190,6 @@ AC_CHECK_TOOLS([OBJCOPY], [gobjcopy objcopy]) https://github.com/ruby/ruby/blob/trunk/configure.ac#L190 AC_CHECK_TOOLS([OBJDUMP], [gobjdump objdump]) AC_CHECK_TOOLS([STRIP], [gstrip strip], [:]) -AS_IF([test "$program_prefix" = NONE], [ - program_prefix= -]) -AS_IF([test "$prefix" -ef .], [ - AC_MSG_ERROR(--prefix cannot be the current working directory.) -]) -RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` -RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"` -AC_SUBST(RUBY_BASE_NAME) -AC_SUBST(RUBYW_BASE_NAME) -AC_SUBST(RUBY_VERSION_NAME, '${RUBY_BASE_NAME}-${ruby_version}') - test x"$target_alias" = x && target_os=`echo $target_os | sed 's/linux-gnu$/linux/;s/linux-gnu/linux-/'` ac_install_sh='' # unusable for extension libraries. @@ -236,8 +237,6 @@ AC_ARG_ENABLE(load-relative, https://github.com/ruby/ruby/blob/trunk/configure.ac#L237 AS_HELP_STRING([--enable-load-relative], [resolve load paths at run time]), [load_relative=$enableval]) -AC_ARG_PROGRAM - dnl Checks for programs. cflagspat= -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/