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

* cygwin/GNUmakefile: better --disbale-shared option support.

Browse Source 
* configure.in: Fix Cygwin specific naming of libraries to
  be net distribution compliant. (ruby-bugs PR#1077)
  cygwin-ruby18.dll -> cygruby18.dll


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2003-08-07 05:43:59 +00:00
parent 755dc335a5
commit 6f059f33ef
3 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Thu Aug 7 14:40:37 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* cygwin/GNUmakefile: better --disbale-shared option support.
Thu Aug 7 14:21:05 2003 Corinna Vinschen <vinschen@redhat.com>
* configure.in: Fix Cygwin specific naming of libraries to
be net distribution compliant. (ruby-bugs PR#1077)
cygwin-ruby18.dll -> cygruby18.dll
Thu Aug 7 12:51:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Aug 7 12:51:38 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* eval.c (rb_f_at_exit): should not be called without a block. * eval.c (rb_f_at_exit): should not be called without a block.

20
configure.in
View File

@ -1201,11 +1201,18 @@ case "$target_os" in
cygwin*|mingw*) cygwin*|mingw*)
case "$target_os" in case "$target_os" in
cygwin*) cygwin*)
RUBY_SO_NAME=$target_os-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR} if test x"$enable_shared" = xyes; then
LIBRUBY_SO='cyg$(RUBY_SO_NAME)'${MAJOR}${MINOR}.dll
LIBRUBY='lib$(RUBY_SO_NAME).dll.a'
fi
AC_LIBOBJ([strftime]) AC_LIBOBJ([strftime])
;; ;;
mingw*) mingw*)
RUBY_SO_NAME=msvcrt-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR} RUBY_SO_NAME=msvcrt-'$(RUBY_INSTALL_NAME)'${MAJOR}${MINOR}
if test x"$enable_shared" = xyes; then
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
LIBRUBY='lib$(LIBRUBY_SO).a'
fi
AC_LIBOBJ([win32]) AC_LIBOBJ([win32])
COMMON_LIBS=m COMMON_LIBS=m
COMMON_MACROS="WIN32_LEAN_AND_MEAN=" COMMON_MACROS="WIN32_LEAN_AND_MEAN="
@ -1214,17 +1221,14 @@ case "$target_os" in
esac esac
XCFLAGS="$XCFLAGS" XCFLAGS="$XCFLAGS"
LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)' LIBRUBY_DLDFLAGS="${DLDFLAGS}"' -Wl,--out-implib=$(LIBRUBY)'
if test x"$enable_shared" = xyes; then LIBRUBY_ALIASES=''
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
LIBRUBY='lib$(LIBRUBY_SO).a' SOLIBS='$(LIBS)'
else if test x"$enable_shared" = xno; then
LIBRUBY_SO=dummy LIBRUBY_SO=dummy
LIBRUBY='lib$(RUBY_SO_NAME).a' LIBRUBY='lib$(RUBY_SO_NAME).a'
LIBRUBYARG='-l$(RUBY_SO_NAME)' LIBRUBYARG='-l$(RUBY_SO_NAME)'
fi fi
LIBRUBY_ALIASES=''
FIRSTMAKEFILE=GNUmakefile:cygwin/GNUmakefile.in
SOLIBS='$(LIBS)'
;; ;;
hpux*) hpux*)
case "$YACC" in case "$YACC" in

15
cygwin/GNUmakefile.in
View File

@ -2,6 +2,12 @@ include Makefile
ENABLE_SHARED=@ENABLE_SHARED@ ENABLE_SHARED=@ENABLE_SHARED@
ifeq (@target_os@,cygwin)
DLL_BASE_NAME := $(subst .dll,,$(LIBRUBY_SO))
else
DLL_BASE_NAME := $(RUBY_SO_NAME)
endif
ifneq ($(ENABLE_SHARED),yes) ifneq ($(ENABLE_SHARED),yes)
RUBY_EXP = $(RUBY_INSTALL_NAME).exp RUBY_EXP = $(RUBY_INSTALL_NAME).exp
EXTOBJS = $(RUBY_EXP) EXTOBJS = $(RUBY_EXP)
@ -14,20 +20,21 @@ ifeq ($(RUBY_INSTALL_NAME),ruby)
else else
RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME)) RUBYW_INSTALL_NAME = $(subst ruby,rubyw,$(RUBY_INSTALL_NAME))
endif endif
WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT) WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
SOLIBS := $(RUBY_SO_NAME).res.@OBJEXT@ $(SOLIBS) SOLIBS := $(DLL_BASE_NAME).res.@OBJEXT@ $(SOLIBS)
EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@) EXTOBJS += $(@:$(EXEEXT)=.res.@OBJEXT@)
$(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO) $(LIBRUBY): $(RUBY_EXP) $(LIBRUBY_SO)
$(RUBY_EXP) $(LIBRUBY_SO): $(RUBY_SO_NAME).res.@OBJEXT@ $(RUBY_EXP) $(LIBRUBY_SO): $(DLL_BASE_NAME).res.@OBJEXT@
%.res.@OBJEXT@: %.rc %.res.@OBJEXT@: %.rc
@WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@ @WINDRES@ --include-dir . --include-dir $(<D) --include-dir $(srcdir)/win32 $< $@
$(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(DLL_BASE_NAME).rc: rbconfig.rb
@$(MINIRUBY) $(srcdir)/win32/resource.rb \ @$(MINIRUBY) $(srcdir)/win32/resource.rb \
-ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \ -ruby_name=$(RUBY_INSTALL_NAME) -rubyw_name=$(RUBYW_INSTALL_NAME) \
-so_name=$(RUBY_SO_NAME) \ -so_name=$(DLL_BASE_NAME) \
. $(icondirs) $(srcdir)/win32 . $(icondirs) $(srcdir)/win32
$(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@ $(PROGRAM): $(RUBY_INSTALL_NAME).res.@OBJEXT@