Группа :: Система/Библиотеки
Пакет: libprelude
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: libprelude-5.2.0-ruby_vendorarchdir.patch
Скачать
Скачать
--- a/configure 2022-08-24 16:39:21.000000000 +0000
+++ b/configure 2022-08-24 16:58:07.957000000 +0000
@@ -22919,7 +22919,7 @@ $as_echo_n "checking for $am_display_RUB
if ${am_cv_ruby_rbexecdir+:} false; then :
$as_echo_n "(cached) " >&6
else
- am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG['prefix'])); \\$prefix = RbConfig::CONFIG['prefix'].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG['sitearchdir'].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`
+ am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG['prefix'])); \\$prefix = RbConfig::CONFIG['prefix'].sub(drive, ''); \\$vendorarchdir = RbConfig::CONFIG['vendorarchdir'].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$vendorarchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/vendor_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ruby_rbexecdir" >&5
$as_echo "$am_cv_ruby_rbexecdir" >&6; }
--- a/configure.ac 2022-08-24 14:31:41.000000000 +0000
+++ b/configure.ac 2022-08-24 15:14:08.102000000 +0000
@@ -537,7 +537,7 @@ AC_ARG_WITH(ruby, AC_HELP_STRING(--with-
[ruby_required=yes; if test x$withval = xyes; then with_ruby="ruby"; fi], with_ruby="ruby")
if test x$with_ruby != xno; then
AM_PATH_RUBY(,with_ruby=yes, with_ruby=no, `dirname $with_ruby`:$PATH)
- RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(archdir)")'`
+ RUBY_ARCHDIR=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(vendorarchdir)")'`
RUBY_LIBRUBYARG=`$RUBY -e 'require "rbconfig.rb"; puts RbConfig::expand("\$(LIBRUBYARG)")'`
RUBY_LIBS="-L$RUBY_ARCHDIR $RUBY_LIBRUBYARG"
--- a/m4/am_path_ruby.m4 2022-08-24 16:39:21.000000000 +0000
+++ b/m4/am_path_ruby.m4 2022-08-24 17:08:48.992000000 +0000
@@ -95,7 +95,7 @@ AC_DEFUN([AM_PATH_RUBY],
dnl (shared libraries)
AC_CACHE_CHECK([for $am_display_RUBY extension module directory],
[am_cv_ruby_rbexecdir],
- [am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG[['prefix']])); \\$prefix = RbConfig::CONFIG[['prefix']].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG[['sitearchdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/site_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`])
+ [am_cv_ruby_rbexecdir=`$RUBY -rrbconfig -e "drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/; prefix = Regexp.new('\\A' + Regexp.quote(RbConfig::CONFIG[['prefix']])); \\$prefix = RbConfig::CONFIG[['prefix']].sub(drive, ''); \\$sitearchdir = RbConfig::CONFIG[['vendorarchdir']].sub(prefix, '\\$(prefix)').sub(drive, ''); print \\$sitearchdir;" 2>/dev/null || echo "${RUBY_EXEC_PREFIX}/local/lib/vendor_ruby/${RUBY_VERSION}/${RUBY_PLATFORM}"`])
AC_SUBST([rbexecdir], [$am_cv_ruby_rbexecdir])
dnl if PKG-CONFIG is available, we use it. Else, we try to dectect RUBY_INCLUDES manually