f8e4dcc126
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)
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
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
|
|
@@ -1472,12 +1472,16 @@
|
|
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}")
|
|
AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB, "${libdir}/site_ruby")
|
|
AC_DEFINE_UNQUOTED(RUBY_DEPRECATED_OLD_SITE_LIB2, "${libdir}/site_ruby/${MAJOR}.${MINOR}")
|
|
+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
|
|
@@ -292,11 +292,17 @@
|
|
#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
|
|
#ifdef RUBY_DEPRECATED_OLD_SITE_ARCHLIB
|
|
ruby_incpush(RUBY_RELATIVE(RUBY_DEPRECATED_OLD_SITE_ARCHLIB));
|
|
#endif
|
|
@@ -308,6 +314,9 @@
|
|
#endif
|
|
|
|
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
|