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

* configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD. [ruby-dev:21791]

Browse Source 
* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2003-10-31 03:58:21 +00:00
parent 1ff2d2a348
commit 0dfe20d3d4
6 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Fri Oct 31 12:55:24 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in, lib/mkmf.rb: add RPATHFLAG for NetBSD.
[ruby-dev:21791]
* bcc32/Makefile.sub, win32/Makefile.sub, win32/Makefile.sub: ditto.
Fri Oct 31 01:38:14 2003 NAKAMURA Usaku <usa@ruby-lang.org> Fri Oct 31 01:38:14 2003 NAKAMURA Usaku <usa@ruby-lang.org>
* wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces * wince/Makefile.sub, win32/Makefile.sub (.y.c): allow white spaces

1
bcc32/Makefile.sub
View File

@ -378,6 +378,7 @@ s,@ENABLE_SHARED@,yes,;t t
s,@OUTFLAG@,-o,;t t s,@OUTFLAG@,-o,;t t
s,@CPPOUTFILE@,,;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,@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_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c $$(<:/=\),;t t

5
configure.in
View File

@ -742,6 +742,7 @@ AC_SUBST(LIBEXT)dnl
STATIC= STATIC=
LIBPATHFLAG=' -L%s' LIBPATHFLAG=' -L%s'
PATHFLAG=''
if test "$with_dln_a_out" != yes; then if test "$with_dln_a_out" != yes; then
rb_cv_dlopen=unknown rb_cv_dlopen=unknown
@ -814,7 +815,8 @@ if test "$with_dln_a_out" != yes; then
netbsd*) LDSHARED='${CC} -shared' netbsd*) LDSHARED='${CC} -shared'
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="-Wl,-export-dynamic" LDFLAGS="-Wl,-export-dynamic"
LIBPATHFLAG=' -L%1$-s -Wl,-R%1$-s' LIBPATHFLAG=' -L%1$-s'
RPATHFLAG=' -Wl,-R%1$-s'
fi fi
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
openbsd*) LDSHARED="\$(CC) -shared ${CCDLFLAGS}" openbsd*) LDSHARED="\$(CC) -shared ${CCDLFLAGS}"
@ -887,6 +889,7 @@ if test "$with_dln_a_out" != yes; then
fi fi
AC_SUBST(LINK_SO) AC_SUBST(LINK_SO)
AC_SUBST(LIBPATHFLAG) AC_SUBST(LIBPATHFLAG)
AC_SUBST(RPATHFLAG)
dln_a_out_works=no dln_a_out_works=no
if test "$ac_cv_header_a_out_h" = yes; then if test "$ac_cv_header_a_out_h" = yes; then

5
lib/mkmf.rb
View File

@ -232,7 +232,9 @@ def cpp_command(outfile, opt="")
end end
def libpathflag(libpath=$LIBPATH) def libpathflag(libpath=$LIBPATH)
libpath.map{|x| LIBPATHFLAG % %["#{x}"]}.join libpath.map{|x|
(x == "$(topdir)" ? LIBPATHFLAG : LIBPATHFLAG+RPATHFLAG) % %["#{x}"]
}.join
end end
def try_link0(src, opt="", &b) def try_link0(src, opt="", &b)
@ -1020,6 +1022,7 @@ LINK_SO = config_string('LINK_SO') ||
"$(OBJS) $(LOCAL_LIBS) $(LIBS)" "$(OBJS) $(LOCAL_LIBS) $(LIBS)"
end end
LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s' LIBPATHFLAG = config_string('LIBPATHFLAG') || ' -L%s'
RPATHFLAG = config_string('RPATHFLAG') || ''
LIBARG = config_string('LIBARG') || '-l%s' LIBARG = config_string('LIBARG') || '-l%s'
CLEANINGS = " CLEANINGS = "

1
win32/Makefile.sub
View File

@ -375,6 +375,7 @@ s,@ENABLE_SHARED@,yes,;t t
s,@OUTFLAG@,-Fe,;t t s,@OUTFLAG@,-Fe,;t t
s,@CPPOUTFILE@,-P,;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,@LIBARG@,%s.lib,;t t
s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t
s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t

1
wince/Makefile.sub
View File

@ -409,6 +409,7 @@ s,@ENABLE_SHARED@,yes,;t t
s,@OUTFLAG@,-Fe,;t t s,@OUTFLAG@,-Fe,;t t
s,@CPPOUTFILE@,-P,;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,@LIBARG@,%s.lib,;t t
s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t s,@LINK_SO@,$$(LDSHARED) -Fe$$(@) $$(OBJS) $$(LIBS) $$(LOCAL_LIBS) $$(DLDFLAGS),;t t
s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t s,@COMPILE_C@,$$(CC) $$(CFLAGS) $$(CPPFLAGS) -c -Tc$$(<:\=/),;t t