rpms/ruby
7
0
Fork 0
Code Issues Pull Requests Releases Activity
8f19dd2c88
ruby/ruby-deprecated-search-path.patch

52 lines
2.0 KiB
Diff
Raw Normal View History

- ruby-deprecated-search-path.patch: added the deprecated installation paths to the search path for the backward compatibility. - added a Provides: ruby(abi) to ruby-libs.
2006-04-20 04:35:04 +00:00
diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
--- ruby-1.8.4.orig/configure.in 2006-04-20 12:53:38.000000000 +0900
+++ ruby-1.8.4/configure.in 2006-04-20 13:06:07.000000000 +0900
- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided and buildsys became much stricker. - ruby-deprecated-sitelib-search-path.patch: applied to add more search path for backward compatiblity. - added byacc to BuildReq. (#194161)
2006-06-07 07:32:39 +00:00
@@ -1472,12 +1472,16 @@
- ruby-deprecated-search-path.patch: added the deprecated installation paths to the search path for the backward compatibility. - added a Provides: ruby(abi) to ruby-libs.
2006-04-20 04:35:04 +00:00
esac
RUBY_SITE_LIB_PATH3="${RUBY_SITE_LIB_PATH2}/${MAJOR}.${MINOR}"
RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
+RUBY_DEPRECATED_SITE_LIB_PATH="${SITE_DIR2}/${MAJOR}.${MINOR}"
AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided and buildsys became much stricker. - ruby-deprecated-sitelib-search-path.patch: applied to add more search path for backward compatiblity. - added byacc to BuildReq. (#194161)
2006-06-07 07:32:39 +00:00
AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
- ruby-deprecated-search-path.patch: added the deprecated installation paths to the search path for the backward compatibility. - added a Provides: ruby(abi) to ruby-libs.
2006-04-20 04:35:04 +00:00
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_LIB, "${RUBY_LIB_PATH2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB, "${SITE_DIR2}")
+AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_SITE_LIB2, "${RUBY_DEPRECATED_SITE_LIB_PATH}")
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
diff -ruN ruby-1.8.4.orig/ruby.c ruby-1.8.4/ruby.c
--- ruby-1.8.4.orig/ruby.c 2005-12-12 09:36:52.000000000 +0900
+++ ruby-1.8.4/ruby.c 2006-04-20 12:59:50.000000000 +0900
- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided and buildsys became much stricker. - ruby-deprecated-sitelib-search-path.patch: applied to add more search path for backward compatiblity. - added byacc to BuildReq. (#194161)
2006-06-07 07:32:39 +00:00
@@ -292,11 +292,17 @@
- ruby-deprecated-search-path.patch: added the deprecated installation paths to the search path for the backward compatibility. - added a Provides: ruby(abi) to ruby-libs.
2006-04-20 04:35:04 +00:00
#endif
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB2));
+#ifdef RUBY_DEPRECATED_SITE_LIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB2));
+#endif
#ifdef RUBY_SITE_THIN_ARCHLIB
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_THIN_ARCHLIB));
#endif
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+#ifdef RUBY_DEPRECATED_SITE_LIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_SITE_LIB));
+#endif
- ruby-deprecated-sitelib-search-path.patch: correct the order of search path.
2006-06-08 07:53:37 +00:00
#ifdef RUBY_DEPRECATED_OLD_SITE_LIB2
ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_LIB2));
- exclude ppc64 to make ruby-mode package. right now emacs.ppc64 isn't provided and buildsys became much stricker. - ruby-deprecated-sitelib-search-path.patch: applied to add more search path for backward compatiblity. - added byacc to BuildReq. (#194161)
2006-06-07 07:32:39 +00:00
#endif
@@ -308,6 +314,9 @@
#endif
- ruby-deprecated-search-path.patch: added the deprecated installation paths to the search path for the backward compatibility. - added a Provides: ruby(abi) to ruby-libs.
2006-04-20 04:35:04 +00:00
ruby_incpush(RUBY_RELATIVE(RUBY_LIB));
+#ifdef RUBY_DEPRECATED_LIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_LIB));
+#endif
#ifdef RUBY_THIN_ARCHLIB
ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));
#endif
Reference in New Issue Copy Permalink