0001-Allow-setting-arch-name-in-.-configure.patch

Antonio Terceiro, 02/18/2013 03:57 AM

Download (1.62 KB)

View differences:

configure.in
3185 3185
	      AS_HELP_STRING([--enable-multiarch], [enable multiarch compatible directories]),
3186 3186
	      [multiarch=], [unset multiarch])
3187 3187

  
3188
AC_ARG_WITH(multiarchname,
3189
	      AS_HELP_STRING([--with-multiarchname], [sets architecture name for multiarch]))
3190

  
3188 3191
archlibdir='${libdir}/${arch}'
3189 3192
sitearchlibdir='${libdir}/${sitearch}'
3190 3193
archincludedir='${includedir}/${arch}'
......
3395 3398
    AC_DEFINE_UNQUOTED(RUBY_ARCH, "universal-"RUBY_PLATFORM_OS !<verconf>!)
3396 3399
    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "universal."RUBY_PLATFORM_CPU"-"RUBY_PLATFORM_OS !<verconf>!)
3397 3400
else
3398
    arch="${target_cpu}-${target_os}"
3401
    if test -z "${with_multiarchname}"; then
3402
        arch="${target_cpu}-${target_os}"
3403
    else
3404
        arch="${with_multiarchname}"
3405
    fi
3399 3406
    AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "${arch}" !<verconf>!)
3400 3407
fi
3401 3408

  
3402
-