Adjust the patch to pass test_archdirs(TestRbConfig).
This is hopefuly better aligned with upstream intentions.
This commit is contained in:
parent
deee8f95aa
commit
58664af968
@ -15,8 +15,8 @@ index d6af000..1c094a3 100644
|
|||||||
rubylibdir='${rubylibprefix}/${ruby_version}'
|
rubylibdir='${rubylibprefix}/${ruby_version}'
|
||||||
rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
|
rubyarchdir=${multiarch+'${rubyarchprefix}/${ruby_version}'}${multiarch-'${rubylibdir}/${arch}'}
|
||||||
|
|
||||||
+AC_ARG_WITH(archdir,
|
+AC_ARG_WITH(rubyarchdir,
|
||||||
+ AS_HELP_STRING([--with-archdir=DIR], [architecture specific ruby libraries [[LIBDIR/RUBY_BASE_NAME/ARCH]]]),
|
+ AS_HELP_STRING([--with-rubyarchdir=DIR], [architecture specific ruby libraries [[LIBDIR/RUBY_BASE_NAME/ARCH]]]),
|
||||||
+ [rubyarchdir=$withval])
|
+ [rubyarchdir=$withval])
|
||||||
+
|
+
|
||||||
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
|
||||||
|
@ -392,7 +392,7 @@ autoconf
|
|||||||
|
|
||||||
%configure \
|
%configure \
|
||||||
--with-rubylibprefix='%{ruby_libdir}' \
|
--with-rubylibprefix='%{ruby_libdir}' \
|
||||||
--with-archdir='%{ruby_libarchdir}' \
|
--with-rubyarchdir='%{ruby_libarchdir}' \
|
||||||
--with-sitedir='%{ruby_sitelibdir}' \
|
--with-sitedir='%{ruby_sitelibdir}' \
|
||||||
--with-sitearchdir='%{ruby_sitearchdir}' \
|
--with-sitearchdir='%{ruby_sitearchdir}' \
|
||||||
--with-vendordir='%{ruby_vendorlibdir}' \
|
--with-vendordir='%{ruby_vendorlibdir}' \
|
||||||
|
Loading…
Reference in New Issue
Block a user