diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-12 02:46:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-12 02:46:40 +0000 |
| commit | 9ac4ebbf2178d48ae7f844e02572f8662c91a589 (patch) | |
| tree | 31f872a799812977354907912ed798b286635186 | |
| parent | c6fe98f4a698bb9e34e224f2381975a260b3af19 (diff) | |
* configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single
quotes. [ruby-dev:22564]
* lib/mkmf.rb (libpathflag): do not enclose with quotes always.
* {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 4 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 | ||||
| -rw-r--r-- | win32/Makefile.sub | 2 | ||||
| -rw-r--r-- | wince/Makefile.sub | 2 |
6 files changed, 20 insertions, 11 deletions
@@ -1,3 +1,12 @@ +Mon Jan 12 11:46:30 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (LIBPATHFLAG, RPATHFLAG): enclose paths with single + quotes. [ruby-dev:22564] + + * lib/mkmf.rb (libpathflag): do not enclose with quotes always. + + * {bcc32,win32,wince}/Makefile.sub (LIBPATHFLAG): quoted. + Mon Jan 12 02:24:07 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/ri/ri_formatter.rb (RI::HtmlFormatter): Add HTML @@ -10,12 +19,12 @@ Mon Jan 12 02:24:07 2004 Dave Thomas <dave@pragprog.com> Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com> - * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList): + * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList): Also accept command line options via the 'RI' environment variable. Sun Jan 11 02:07:47 2004 Dave Thomas <dave@pragprog.com> - * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList): + * lib/rdoc/ri/ri_options.rb (RI::Options::OptionList::OptionList): Also accept command line options via the 'RI' environment variable. Sat Jan 10 21:27:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org> diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 537dc14e94..09f5a029f2 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -380,10 +380,10 @@ s,@DLDLIBS@,$(DLDLIBS),;t t s,@ENABLE_SHARED@,yes,;t t s,@OUTFLAG@,-o,;t t s,@CPPOUTFILE@,,;t t -s,@LIBPATHFLAG@, -L%s,;t t +s,@LIBPATHFLAG@, -L"%s",;t t s,@RPATHFLAG@,,;t t s,@LIBARG@,%s.lib,;t t -s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$@, nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t +s,@LINK_SO@,$$(LDSHARED) $$(DLDFLAGS) $$(LIBPATH) $$(OBJS), $$(@:/=\), nul, $$(LIBS) $$(LOCAL_LIBS), $$(DEFFILE), $$(RESFILE),;t t s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t s,@COMPILE_CXX@,$$(CXX) $$(CXXFLAGS) $$(CPPFLAGS) -P -c $$(<:/=\),;t t s,@COMPILE_RULES@,{$$(srcdir)}.%s{}.%s: .%s.%s:,;t t diff --git a/configure.in b/configure.in index 3c07c4e402..9a2416c75c 100644 --- a/configure.in +++ b/configure.in @@ -799,7 +799,7 @@ AC_SUBST(DLEXT2)dnl AC_SUBST(LIBEXT)dnl STATIC= -: ${LIBPATHFLAG=' -L%s'} +: ${LIBPATHFLAG=" -L'%s'"} : ${PATHFLAG=''} if test "$with_dln_a_out" != yes; then @@ -873,8 +873,8 @@ if test "$with_dln_a_out" != yes; then netbsd*) : ${LDSHARED='${CC} -shared'} if test "$rb_cv_binary_elf" = yes; then LDFLAGS="$LDFLAGS -Wl,-export-dynamic" - LIBPATHFLAG=' -L%1$-s' - RPATHFLAG=' -Wl,-R%1$-s' + LIBPATHFLAG=" -L'%1\$-s'" + RPATHFLAG=" -Wl,-R'%1\$-s'" fi rb_cv_dlopen=yes ;; openbsd*) : ${LDSHARED="\$(CC) -shared ${CCDLFLAGS}"} diff --git a/lib/mkmf.rb b/lib/mkmf.rb index c74c252a84..2a0adab739 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -234,7 +234,7 @@ end def libpathflag(libpath=$LIBPATH) libpath.map{|x| - (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % %['#{x}'] + (x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % x }.join end @@ -1020,7 +1020,7 @@ LINK_SO = config_string('LINK_SO') || "$(LDSHARED) $(DLDFLAGS) $(LIBPATH) #{OUTFLAG}$(DLLIB) " \ "$(OBJS) $(LOCAL_LIBS) $(LIBS)" end -LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s' +LIBPATHFLAG = config_string('LIBPATHFLAG') || " -L'%s'" RPATHFLAG = config_string('RPATHFLAG') || '' LIBARG = config_string('LIBARG') || '-l%s' diff --git a/win32/Makefile.sub b/win32/Makefile.sub index 64829a659c..ab7b465e68 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -379,7 +379,7 @@ s,@DLDLIBS@,$(DLDLIBS),;t t s,@ENABLE_SHARED@,yes,;t t s,@OUTFLAG@,-Fe,;t t s,@CPPOUTFILE@,-P,;t t -s,@LIBPATHFLAG@, -libpath:%s,;t t +s,@LIBPATHFLAG@, -libpath:"%s",;t t s,@RPATHFLAG@,,;t t s,@LIBARG@,%s.lib,;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t diff --git a/wince/Makefile.sub b/wince/Makefile.sub index fe084de39f..0406f643fd 100644 --- a/wince/Makefile.sub +++ b/wince/Makefile.sub @@ -411,7 +411,7 @@ s,@DLDLIBS@,$(DLDLIBS),;t t s,@ENABLE_SHARED@,yes,;t t s,@OUTFLAG@,-Fe,;t t s,@CPPOUTFILE@,-P,;t t -s,@LIBPATHFLAG@, -libpath:%s,;t t +s,@LIBPATHFLAG@, -libpath:"%s",;t t s,@RPATHFLAG@,,;t t s,@LIBARG@,%s.lib,;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t |