kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-19 05:48:14 +00:00
parent e2f6281302
commit 6d3ceb6ce3
5 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Thu Feb 19 14:48:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in, */Makefile.sub (LOAD_RELATIVE): moved from ruby.c
Thu Feb 19 14:39:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (darwin): uses -unexported_symbol option of ld instead

1
bcc32/Makefile.sub
View file

@ -354,6 +354,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub
\#define NEED_IO_SEEK_BETWEEN_RW 1
\#define STACK_GROW_DIRECTION -1
\#define DEFAULT_KCODE KCODE_NONE
\#define LOAD_RELATIVE 1
\#define DLEXT ".so"
\#define RUBY_LIB "/lib/ruby/$(MAJOR).$(MINOR).$(TEENY)"
\#define RUBY_SITE_LIB "/lib/ruby/site_ruby"

14
configure.in
View file

@ -1664,7 +1664,11 @@ else
when(nextstep*|openstep*|rhapsody*|darwin*)
DLEXT=bundle;;
when(os2-emx*)
LOAD_RELATIVE=1
DLEXT=dll;;
when(cygwin*|mingw*|*djgpp*)
LOAD_RELATIVE=1
DLEXT=so;;
when(*)
DLEXT=so;;
esac
@ -2132,18 +2136,16 @@ AC_ARG_WITH(vendordir,
[vendordir='${libdir}/${RUBY_INSTALL_NAME}/vendor_ruby'])
VENDOR_DIR=`eval echo \\"${vendordir}\\"`
case "$target_os" in
when(cygwin*|mingw*|*djgpp*|os2-emx*)
if test "${LOAD_RELATIVE+set}"; then
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_LIB_PREFIX="`eval echo "$RUBY_LIB_PREFIX" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
RUBY_SITE_LIB_PATH="`eval echo "$SITE_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
RUBY_VENDOR_LIB_PATH="`eval echo "$VENDOR_DIR" | sed 's|^NONE/|/|;s|^'"$prefix"'/|/|'`"
;;
when(*)
else
RUBY_LIB_PREFIX="`eval echo \\"$RUBY_LIB_PREFIX\\" | sed 's|^NONE/|'"$prefix"'/|'`"
RUBY_SITE_LIB_PATH="`eval echo \\"$SITE_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
RUBY_VENDOR_LIB_PATH="`eval echo \\"$VENDOR_DIR\\" | sed 's|^NONE/|'"$prefix"'/|'`"
;;
esac
fi
pat="$RUBY_LIB_PREFIX/"'\(.*\)'
RUBY_LIB_PATH='RUBY_LIB_PREFIX"/"RUBY_LIB_VERSION'

4
ruby.c
View file

@ -331,10 +331,6 @@ ruby_incpush_expand(const char *path)
ruby_push_include(path, expand_include_path);
}
#if (defined DOSISH || defined __CYGWIN__) && !defined __SYMBIAN32__
#define LOAD_RELATIVE 1
#endif
#if defined _WIN32 || defined __CYGWIN__
static HMODULE libruby;

1
win32/Makefile.sub
View file

@ -488,6 +488,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub
!endif
#define CANONICALIZATION_FOR_MATHN 1
#define DEFAULT_KCODE KCODE_NONE
#define LOAD_RELATIVE 1
#define DLEXT ".so"
#define RUBY_LIB_VERSION STRINGIZE(RUBY_VERSION_MAJOR)"."STRINGIZE(RUBY_VERSION_MINOR)"."STRINGIZE(RUBY_VERSION_TEENY)
#define RUBY_LIB_PREFIX "/lib/$(RUBY_INSTALL_NAME)"