1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current

Browse Source 
directory.

* lib/mkmf.rb (init_mkmf): add current directory to default
  library path with highest priority.  [ruby-core:10960]

* lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-04-23 13:08:29 +00:00
parent 138362834f
commit 692010a235
3 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Mon Apr 23 22:09:17 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (libpathflag): not to append RPATHFLAG to current
directory.
* lib/mkmf.rb (init_mkmf): add current directory to default
library path with highest priority. [ruby-core:10960]
* lib/mkmf.rb (LINK_SO): LIBPATH to be placed before DLDFLAGS.
Fri Apr 20 16:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Apr 20 16:05:22 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted, * configure.in (LIBPATHFLAG, RPATHFLAG): no needs to be quoted,

12
lib/mkmf.rb
View File

@ -291,7 +291,12 @@ end
def libpathflag(libpath=$DEFLIBPATH|$LIBPATH) def libpathflag(libpath=$DEFLIBPATH|$LIBPATH)
libpath.map{|x| libpath.map{|x|
(x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x.quote case x
when "$(topdir)", /\A\./
LIBPATHFLAG
else
LIBPATHFLAG+RPATHFLAG
end % x.quote
}.join }.join
end end
@ -1443,6 +1448,7 @@ def init_mkmf(config = CONFIG)
$LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC']
$LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED']
$DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"]
$DEFLIBPATH.unshift(".")
$LIBPATH = [] $LIBPATH = []
$INSTALLFILES = nil $INSTALLFILES = nil
@ -1534,8 +1540,8 @@ LINK_SO = config_string('LINK_SO') ||
if CONFIG["DLEXT"] == $OBJEXT if CONFIG["DLEXT"] == $OBJEXT
"ld $(DLDFLAGS) -r -o $@ $(OBJS)\n" "ld $(DLDFLAGS) -r -o $@ $(OBJS)\n"
else else
"$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$@ " \ "$(LDSHARED) #{OUTFLAG}$@ $(OBJS) " \
"$(OBJS) $(LOCAL_LIBS) $(LIBS)" "$(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)"
end end
LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"' LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L"%s"'
RPATHFLAG = config_string('RPATHFLAG') || '' RPATHFLAG = config_string('RPATHFLAG') || ''

6
version.h
View File

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-04-20" #define RUBY_RELEASE_DATE "2007-04-23"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070420 #define RUBY_RELEASE_CODE 20070423
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 4 #define RUBY_RELEASE_MONTH 4
#define RUBY_RELEASE_DAY 20 #define RUBY_RELEASE_DAY 23
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_release_date[];