ruby-changes:27054
From: nobu <ko1@a...>
Date: Wed, 6 Feb 2013 17:32:57 +0900 (JST)
Subject: [ruby-changes:27054] nobu:r39105 (trunk): configure.in: architecture name
nobu 2013-02-06 17:32:43 +0900 (Wed, 06 Feb 2013) New Revision: 39105 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39105 Log: configure.in: architecture name * configure.in, version.c: parametric architecture name for paths. Modified files: trunk/ChangeLog trunk/configure.in trunk/version.c Index: configure.in =================================================================== --- configure.in (revision 39104) +++ configure.in (revision 39105) @@ -3143,8 +3143,8 @@ shvar_to_cpp() { https://github.com/ruby/ruby/blob/trunk/configure.in#L3143 -e 's/\${\([[A-Z][A-Z_]]*\)}/"\1"/g' \ -e 's|\${libdir}|'"${libdir}|g" \ -e 's/\${ruby_version}/"RUBY_LIB_VERSION"/g' \ - -e 's/\${arch}/"RUBY_ARCH"/g' \ - -e 's/\${sitearch}/"RUBY_SITEARCH"/g' \ + -e 's/\${arch}/"arch"/g' \ + -e 's/\${sitearch}/"arch"/g' \ -e 's/\${vendorarchdir}/"RUBY_VENDOR_ARCH_LIB"/g' \ -e 's/\${sitearchdir}/"RUBY_SITE_ARCH_LIB"/g' \ -e 's/\${vendorlibdir}/"RUBY_VENDOR_LIB2"/g' \ @@ -3240,17 +3240,23 @@ shvar_to_cpp RUBY_LIB "${rubylibdir}" https://github.com/ruby/ruby/blob/trunk/configure.in#L3240 if test "x${RUBY_LIB}" != 'xRUBY_LIB_PREFIX"/"RUBY_LIB_VERSION'; then AC_DEFINE_UNQUOTED(RUBY_LIB, ${RUBY_LIB} !<verconf>!) fi +shvar_to_cpp RUBY_ARCH_LIB_FOR "${rubyarchdir}" +AC_DEFINE_UNQUOTED(RUBY_ARCH_LIB_FOR(arch), ${RUBY_ARCH_LIB_FOR} !<verconf>!) if test "x$sitedir" = xno; then AC_DEFINE(NO_RUBY_SITE_LIB, [] !<verconf>!) else shvar_to_cpp RUBY_SITE_LIB "${sitedir}" AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, ${RUBY_SITE_LIB} !<verconf>!) + shvar_to_cpp RUBY_SITE_ARCH_LIB_FOR "${sitearchdir}" + AC_DEFINE_UNQUOTED(RUBY_SITE_ARCH_LIB_FOR(arch), ${RUBY_SITE_ARCH_LIB_FOR} !<verconf>!) fi if test "x$vendordir" = xno; then AC_DEFINE(NO_RUBY_VENDOR_LIB, [] !<verconf>!) else shvar_to_cpp RUBY_VENDOR_LIB "${vendordir}" AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, ${RUBY_VENDOR_LIB} !<verconf>!) + shvar_to_cpp RUBY_VENDOR_ARCH_LIB_FOR "${vendorarchdir}" + AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCH_LIB_FOR(arch), ${RUBY_VENDOR_ARCH_LIB_FOR} !<verconf>!) fi AC_SUBST(arch)dnl Index: ChangeLog =================================================================== --- ChangeLog (revision 39104) +++ ChangeLog (revision 39105) @@ -1,4 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 -Wed Feb 6 17:32:36 2013 Nobuyoshi Nakada <nobu@r...> +Wed Feb 6 17:32:41 2013 Nobuyoshi Nakada <nobu@r...> + + * configure.in, version.c: parametric architecture name for paths. * configure.in (shvar_to_cpp): convert sh variable references by replacing with string literal forms in cpp. Index: version.c =================================================================== --- version.c (revision 39104) +++ version.c (revision 39105) @@ -42,13 +42,14 @@ https://github.com/ruby/ruby/blob/trunk/version.c#L42 #define RUBY_LIB RUBY_LIB_PREFIX "/"RUBY_LIB_VERSION #define RUBY_SITE_LIB2 RUBY_SITE_LIB "/"RUBY_LIB_VERSION #define RUBY_VENDOR_LIB2 RUBY_VENDOR_LIB "/"RUBY_LIB_VERSION -#define RUBY_ARCHLIB RUBY_LIB "/"RUBY_ARCH -#define RUBY_SITE_ARCHLIB RUBY_SITE_LIB2 "/"RUBY_SITEARCH -#define RUBY_VENDOR_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_SITEARCH -#ifdef RUBY_THINARCH -#define RUBY_THIN_ARCHLIB RUBY_LIB "/"RUBY_THINARCH -#define RUBY_SITE_THIN_ARCHLIB RUBY_SITE_LIB2 "/"RUBY_THINARCH -#define RUBY_VENDOR_THIN_ARCHLIB RUBY_VENDOR_LIB2 "/"RUBY_THINARCH +#ifndef RUBY_ARCH_LIB_FOR +#define RUBY_ARCH_LIB_FOR(arch) RUBY_LIB "/"arch +#endif +#ifndef RUBY_SITE_ARCH_LIB_FOR +#define RUBY_SITE_ARCH_LIB_FOR(arch) RUBY_SITE_LIB2 "/"arch +#endif +#ifndef RUBY_VENDOR_ARCH_LIB_FOR +#define RUBY_VENDOR_ARCH_LIB_FOR(arch) RUBY_VENDOR_LIB2 "/"arch #endif const int ruby_api_version[] = { @@ -72,27 +73,27 @@ const char ruby_initial_load_paths[] = https://github.com/ruby/ruby/blob/trunk/version.c#L73 #endif #ifndef NO_RUBY_SITE_LIB RUBY_SITE_LIB2 "\0" -#ifdef RUBY_SITE_THIN_ARCHLIB - RUBY_SITE_THIN_ARCHLIB "\0" +#ifdef RUBY_THINARCH + RUBY_SITE_ARCH_LIB_FOR(RUBY_THINARCH) "\0" #endif - RUBY_SITE_ARCHLIB "\0" + RUBY_SITE_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" RUBY_SITE_LIB "\0" #endif #ifndef NO_RUBY_VENDOR_LIB RUBY_VENDOR_LIB2 "\0" -#ifdef RUBY_VENDOR_THIN_ARCHLIB - RUBY_VENDOR_THIN_ARCHLIB "\0" +#ifdef RUBY_THINARCH + RUBY_VENDOR_ARCH_LIB_FOR(RUBY_THINARCH) "\0" #endif - RUBY_VENDOR_ARCHLIB "\0" + RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" RUBY_VENDOR_LIB "\0" #endif RUBY_LIB "\0" -#ifdef RUBY_THIN_ARCHLIB - RUBY_THIN_ARCHLIB "\0" +#ifdef RUBY_THINARCH + RUBY_ARCH_LIB_FOR(RUBY_THINARCH) "\0" #endif - RUBY_ARCHLIB "\0" + RUBY_ARCH_LIB_FOR(RUBY_ARCH) "\0" #endif ""; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/