ruby-vendordir.patch

   1 diff -ur ruby-1.8.6-p111-o/configure.in ruby-1.8.6-p111/configure.in
   2 --- ruby-1.8.6-p111-o/configure.in      2007-12-07 18:57:23.000000000 -0700
   3 +++ ruby-1.8.6-p111/configure.in        2007-12-07 21:44:21.000000000 -0700
   4 @@ -1575,9 +1575,28 @@
   5  AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
   6  AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
   7
   8 +AC_ARG_WITH(vendordir,
   9 +           [  --with-vendordir=DIR      vendor libraries in DIR [LIBDIR/ruby/vendor_ruby]],
  10 +            [vendordir=$withval],
  11 +            [vendordir='${libdir}/ruby/vendor_ruby'])
  12 +VENDOR_DIR=`eval echo \\"${vendordir}\\"`
  13 +case "$target_os" in
  14 +  cygwin*|mingw*|*djgpp*|os2_emx*)
  15 +    RUBY_VENDOR_LIB_PATH="`expr "$VENDOR_DIR" : "$prefix\(/.*\)"`" ||
  16 +    RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
  17 +  *)
  18 +    RUBY_VENDOR_LIB_PATH="$VENDOR_DIR";;
  19 +esac
  20 +RUBY_VENDOR_LIB_PATH2="${RUBY_VENDOR_LIB_PATH}/${MAJOR}.${MINOR}"
  21 +
  22 +AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB, "${RUBY_VENDOR_LIB_PATH}")
  23 +AC_DEFINE_UNQUOTED(RUBY_VENDOR_LIB2, "${RUBY_VENDOR_LIB_PATH2}")
  24 +
  25  AC_SUBST(arch)dnl
  26  AC_SUBST(sitearch)dnl
  27 +AC_SUBST(vendorarch)dnl
  28  AC_SUBST(sitedir)dnl
  29 +AC_SUBST(vendordir)dnl
  30
  31  configure_args=$ac_configure_args
  32  AC_SUBST(configure_args)dnl
  33 @@ -1590,6 +1609,8 @@
  34
  35      AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
  36                   "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
  37 +    AC_DEFINE_UNQUOTED(RUBY_VENDOR_THIN_ARCHLIB,
  38 +                 "${RUBY_VENDOR_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
  39      AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
  40  else
  41      arch="${target_cpu}-${target_os}"
  42 @@ -1597,12 +1618,15 @@
  43  fi
  44
  45  case "$target_os" in
  46 -  mingw*) sitearch="i386-$rb_cv_msvcrt" ;;
  47 -  *) sitearch="${arch}" ;;
  48 +  mingw*) sitearch="i386-$rb_cv_msvcrt"
  49 +                 vendorarch="i386-$rb_cv_msvcrt" ;;
  50 +  *) sitearch="${arch}"
  51 +     vendorarch="${arch}" ;;
  52  esac
  53
  54  AC_DEFINE_UNQUOTED(RUBY_ARCHLIB, "${RUBY_LIB_PATH}/${arch}")
  55  AC_DEFINE_UNQUOTED(RUBY_SITE_ARCHLIB, "${RUBY_SITE_LIB_PATH2}/${sitearch}")
  56 +AC_DEFINE_UNQUOTED(RUBY_VENDOR_ARCHLIB, "${RUBY_VENDOR_LIB_PATH2}/${vendorarch}")
  57
  58  AC_ARG_WITH(search-path,
  59                 [  --with-search-path=DIR specify the additional search path],
  60 diff -ur ruby-1.8.6-p111-o/instruby.rb ruby-1.8.6-p111/instruby.rb
  61 --- ruby-1.8.6-p111-o/instruby.rb       2007-12-07 18:57:32.000000000 -0700
  62 +++ ruby-1.8.6-p111/instruby.rb 2007-12-07 21:44:21.000000000 -0700
  63 @@ -162,6 +162,8 @@
  64  archlibdir = CONFIG["archdir"]
  65  sitelibdir = CONFIG["sitelibdir"]
  66  sitearchlibdir = CONFIG["sitearchdir"]
  67 +vendorlibdir = CONFIG["vendorlibdir"]
  68 +vendorarchlibdir = CONFIG["vendorarchdir"]
  69  mandir = File.join(CONFIG["mandir"], "man")
  70  configure_args = Shellwords.shellwords(CONFIG["configure_args"])
  71  enable_shared = CONFIG["ENABLE_SHARED"] == 'yes'
  72 @@ -202,7 +204,7 @@
  73    extout = "#$extout"
  74    install?(:ext, :arch, :'ext-arch') do
  75      puts "installing extension objects"
  76 -    makedirs [archlibdir, sitearchlibdir]
  77 +    makedirs [archlibdir, sitearchlibdir, vendorarchlibdir]
  78      if noinst = CONFIG["no_install_files"] and noinst.empty?
  79        noinst = nil
  80      end
  81 @@ -210,7 +212,7 @@
  82    end
  83    install?(:ext, :comm, :'ext-comm') do
  84      puts "installing extension scripts"
  85 -    makedirs [rubylibdir, sitelibdir]
  86 +    makedirs [rubylibdir, sitelibdir, vendorlibdir]
  87      install_recursive("#{extout}/common", rubylibdir)
  88    end
  89  end
  90 diff -ur ruby-1.8.6-p111-o/lib/mkmf.rb ruby-1.8.6-p111/lib/mkmf.rb
  91 --- ruby-1.8.6-p111-o/lib/mkmf.rb       2007-12-07 18:56:55.000000000 -0700
  92 +++ ruby-1.8.6-p111/lib/mkmf.rb 2007-12-07 21:44:21.000000000 -0700
  93 @@ -51,6 +51,9 @@
  94  $sitedir = CONFIG["sitedir"]
  95  $sitelibdir = CONFIG["sitelibdir"]
  96  $sitearchdir = CONFIG["sitearchdir"]
  97 +$vendordir = CONFIG["vendordir"]
  98 +$vendorlibdir = CONFIG["vendorlibdir"]
  99 +$vendorarchdir = CONFIG["vendorarchdir"]
 100
 101  $mswin = /mswin/ =~ RUBY_PLATFORM
 102  $bccwin = /bccwin/ =~ RUBY_PLATFORM
 103 @@ -417,7 +420,7 @@
 104
 105  def try_func(func, libs, headers = nil, &b)
 106    headers = cpp_include(headers)
 107 -  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
 108 +  try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b) or try_link(<<"SRC", libs, &b)
 109  #{COMMON_HEADERS}
 110  #{headers}
 111  /*top*/
 112 @@ -429,6 +432,11 @@
 113  int main() { return 0; }
 114  int t() { #{func}(); return 0; }
 115  SRC
 116 +int #{func}();
 117 +/*top*/
 118 +int main() { return 0; }
 119 +int t() { #{func}(); return 0; }
 120 +SRC
 121  end
 122
 123  def try_var(var, headers = nil, &b)
 124 @@ -1097,6 +1105,7 @@
 125  RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
 126  arch = #{CONFIG['arch']}
 127  sitearch = #{CONFIG['sitearch']}
 128 +vendorarch = #{CONFIG['vendorarch']}
 129  ruby_version = #{Config::CONFIG['ruby_version']}
 130  ruby = #{$ruby}
 131  RUBY = $(ruby#{sep})
 132 Only in ruby-1.8.6-p111/lib: mkmf.rb.orig
 133 diff -ur ruby-1.8.6-p111-o/Makefile.in ruby-1.8.6-p111/Makefile.in
 134 --- ruby-1.8.6-p111-o/Makefile.in       2007-12-07 18:57:25.000000000 -0700
 135 +++ ruby-1.8.6-p111/Makefile.in 2007-12-07 21:44:21.000000000 -0700
 136 @@ -24,6 +24,8 @@
 137  arch = @arch@
 138  sitearch = @sitearch@
 139  sitedir = @sitedir@
 140 +vendorarch = @vendorarch@
 141 +vendordir = @vendordir@
 142
 143  TESTUI = console
 144  TESTS =
 145 diff -ur ruby-1.8.6-p111-o/mkconfig.rb ruby-1.8.6-p111/mkconfig.rb
 146 --- ruby-1.8.6-p111-o/mkconfig.rb       2007-12-07 18:57:32.000000000 -0700
 147 +++ ruby-1.8.6-p111/mkconfig.rb 2007-12-07 21:44:21.000000000 -0700
 148 @@ -143,6 +143,14 @@
 149    CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
 150    CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
 151    CONFIG["sitearchdir"] = "$(sitelibdir)/$(sitearch)"
 152 +  CONFIG["vendorlibdir"] = "$(vendordir)/$(ruby_version)"
 153 +  CONFIG["vendorarchdir"] = "$(vendorlibdir)/$(vendorarch)"
 154 +  if defined?(VENDOR_SPECIFIC) && VENDOR_SPECIFIC
 155 +       CONFIG["sitearch"] = CONFIG["vendorarch"]
 156 +       CONFIG["sitedir"] = CONFIG["vendordir"]
 157 +       CONFIG["sitelibdir"] = CONFIG["vendorlibdir"]
 158 +       CONFIG["sitearchdir"] = CONFIG["vendorarchdir"]
 159 +  end
 160    CONFIG["topdir"] = File.dirname(__FILE__)
 161    MAKEFILE_CONFIG = {}
 162    CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
 163 Only in ruby-1.8.6-p111: mkconfig.rb.orig
 164 diff -ur ruby-1.8.6-p111-o/ruby.c ruby-1.8.6-p111/ruby.c
 165 --- ruby-1.8.6-p111-o/ruby.c    2007-12-07 18:57:31.000000000 -0700
 166 +++ ruby-1.8.6-p111/ruby.c      2007-12-07 22:30:13.000000000 -0700
 167 @@ -321,6 +321,13 @@
 168  #endif
 169      incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
 170      incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
 171 +
 172 +    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
 173 +#ifdef RUBY_VENDOR_THIN_ARCHLIB
 174 +    incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
 175 +#endif
 176 +    incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
 177 +    incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
 178
 179      incpush(RUBY_RELATIVE(RUBY_LIB));
 180  #ifdef RUBY_THIN_ARCHLIB
 181 Only in ruby-1.8.6-p111: ruby.c~
 182 Only in ruby-1.8.6-p111: ruby.c.orig
 183 Only in ruby-1.8.6-p111: ruby.c.rej
 184 Only in ruby-1.8.6-p111: ruby.c.rej~