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

* configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.

Browse Source 
* configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
  is specified.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2551 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2002-06-11 10:26:13 +00:00
parent 65caf01223
commit 7f80a1800f
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Tue Jun 11 19:20:34 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in (LIBRUBY): rename to lib$(LIBRUBY_SO).a on Cygwin/MinGW.
* configure.in, cygwin/GNUmakefile: use dllwrap when --disable-shared
is specified.
Tue Jun 11 13:18:47 2002 Shugo Maeda <shugo@ruby-lang.org> Tue Jun 11 13:18:47 2002 Shugo Maeda <shugo@ruby-lang.org>
* lib/net/ftp.rb (noop): new method. * lib/net/ftp.rb (noop): new method.

6
configure.in
View File

@ -104,6 +104,7 @@ case "$target_os" in
cygwin*|mingw*) cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm) AC_CHECK_TOOL(NM, nm)
AC_CHECK_TOOL(WINDRES, windres) AC_CHECK_TOOL(WINDRES, windres)
AC_CHECK_TOOL(DLLWRAP, dllwrap)
target_cpu=`echo $target_cpu | sed s/i.86/i386/` target_cpu=`echo $target_cpu | sed s/i.86/i386/`
: ${enable_shared=yes} : ${enable_shared=yes}
;; ;;
@ -1044,13 +1045,14 @@ case "$target_os" in
if test x"$enable_shared" = xyes; then if test x"$enable_shared" = xyes; then
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
LIBRUBY_DLDFLAGS='-Wl,--out-implib=$(LIBRUBY) $(RUBYDEF)' LIBRUBY_DLDFLAGS='-Wl,--out-implib=$(LIBRUBY) $(RUBYDEF)'
LIBRUBY='lib$(LIBRUBY_SO).a'
else else
LIBRUBY_SO=dummy LIBRUBY_SO=dummy
LIBRUBY_DLDFLAGS='-Wl,--output-exp=$(RUBY_INSTALL_NAME).exp,--out-implib=$(LIBRUBY) $(RUBYDEF)' LIBRUBY_DLDFLAGS=''
LIBRUBY='lib$(RUBY_SO_NAME).a'
fi fi
LIBRUBY_ALIASES='' LIBRUBY_ALIASES=''
LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a' LIBRUBY_A='lib$(RUBY_INSTALL_NAME)s.a'
LIBRUBY='lib$(RUBY_SO_NAME).a'
LIBRUBYARG='-L. -l$(RUBY_SO_NAME)' LIBRUBYARG='-L. -l$(RUBY_SO_NAME)'
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
SOLIBS='$(LIBS)' SOLIBS='$(LIBS)'

21
cygwin/GNUmakefile.in
View File

@ -2,24 +2,25 @@ include Makefile
ENABLE_SHARED=@ENABLE_SHARED@ ENABLE_SHARED=@ENABLE_SHARED@
ifneq (,$(findstring no, $(ENABLE_SHARED))) ifeq ($(ENABLE_SHARED),yes)
EXTOBJS = $(RUBY_INSTALL_NAME).exp
LIBRUBYARG = $(LIBRUBY_A)
else
CPPFLAGS += -DLIBRUBY_SO=\"$(LIBRUBY_SO)\" CPPFLAGS += -DLIBRUBY_SO=\"$(LIBRUBY_SO)\"
else
RUBY_EXP = $(RUBY_INSTALL_NAME).exp
EXTOBJS = $(RUBY_EXP)
LIBRUBYARG = $(LIBRUBY_A)
endif endif
ifneq (,$(findstring ruby, $(RUBY_INSTALL_NAME))) ifeq ($(RUBY_INSTALL_NAME),ruby)
RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
else
RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w RUBYW_INSTALL_NAME = $(RUBY_INSTALL_NAME)w
else
RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
endif endif
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
RUBYDEF = $(RUBY_INSTALL_NAME).def RUBYDEF = $(RUBY_INSTALL_NAME).def
SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS) SOLIBS := $(LIBRUBY_SO).res.@OBJEXT@ $(SOLIBS)
EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
$(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ $(LIBRUBY_SO): $(RUBYDEF) $(LIBRUBY_SO).res.@OBJEXT@ $(RUBY_EXP)
$(LIBRUBY): $(LIBRUBY_SO) $(LIBRUBY): $(LIBRUBY_SO)
%.res.@OBJEXT@: %.rc %.res.@OBJEXT@: %.rc
@ -41,3 +42,7 @@ $(RUBYDEF): $(LIBRUBY_A)
echo EXPORTS > $(RUBYDEF) echo EXPORTS > $(RUBYDEF)
@NM@ --extern-only --defined-only $(LIBRUBY_A) | \ @NM@ --extern-only --defined-only $(LIBRUBY_A) | \
@MINIRUBY@ -ne 'puts $$1 if / [CDT] _(.*)$$/' >> $(RUBYDEF) @MINIRUBY@ -ne 'puts $$1 if / [CDT] _(.*)$$/' >> $(RUBYDEF)
$(RUBY_EXP): $(RUBYDEF)
@DLLWRAP@ --output-exp=$(RUBY_EXP) --output-lib=$(LIBRUBY) \
--def=$(RUBYDEF) $(LIBRUBY_A) $(LIBS) -o $(PROGRAM)
rm $(PROGRAM)