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

* Makefile.in (CPPFLAGS): remove @includedir@.

Browse Source 
* lib/mkmf.rb (create_makefile): ditto.

* ext/extmk.rb.in (create_makefile): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2320 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2002-04-02 06:48:45 +00:00
parent 1cfece051c
commit 1c6a8e4deb
5 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Apr 2 15:17:54 2002 Yukihiro Matsumoto <matz@ruby-lang.org>
* Makefile.in (CPPFLAGS): remove @includedir@.
* lib/mkmf.rb (create_makefile): ditto.
* ext/extmk.rb.in (create_makefile): ditto.
Tue Apr 2 15:09:05 2002 WATANABE Hirofumi <eban@ruby-lang.org> Tue Apr 2 15:09:05 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* ext/socket/socket.c (sock_addrinfo): should clear addrinfo hints. * ext/socket/socket.c (sock_addrinfo): should clear addrinfo hints.

2
Makefile.in
View File

@ -13,7 +13,7 @@ AUTOCONF = autoconf
prefix = @prefix@ prefix = @prefix@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@
CPPFLAGS = -I. -I$(srcdir) -I@includedir@ CPPFLAGS = -I. -I$(srcdir)
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@ LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
XLDFLAGS = @XLDFLAGS@ XLDFLAGS = @XLDFLAGS@
EXTLIBS = EXTLIBS =

7
ext/extmk.rb.in
View File

@ -25,7 +25,6 @@ end
SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"] SRC_EXT = ["c", "cc", "m", "cxx", "cpp", "C"]
$extlist = [] $extlist = []
$includedir = "@includedir@"
$libdir = "@libdir@" $libdir = "@libdir@"
$top_srcdir = "@top_srcdir@" $top_srcdir = "@top_srcdir@"
@ -76,8 +75,8 @@ if /mswin32/ =~ RUBY_PLATFORM
else else
OUTFLAG = '-o ' OUTFLAG = '-o '
end end
LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@" LINK = "@CC@ #{OUTFLAG}conftest -I#$topdir -I#$top_srcdir #{CFLAGS} @LDFLAGS@ %s %s %s conftest.c %s %s @LIBS@"
CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} -I#$includedir %s %s %s conftest.c" CPP = "@CPP@ @CPPFLAGS@ -I#$topdir -I#$top_srcdir #{CFLAGS} %s %s %s conftest.c"
$log = open('extmk.log', 'w') $log = open('extmk.log', 'w')
@ -415,7 +414,7 @@ hdrdir = #{$top_srcdir}
CC = @CC@ CC = @CC@
CFLAGS = %s #{CFLAGS} #$CFLAGS CFLAGS = %s #{CFLAGS} #$CFLAGS
CPPFLAGS = -I$(topdir) -I$(hdrdir) -I@includedir@ %s #$CPPFLAGS CPPFLAGS = -I$(topdir) -I$(hdrdir) %s #$CPPFLAGS
DLDFLAGS = #$DLDFLAGS #$LDFLAGS DLDFLAGS = #$DLDFLAGS #$LDFLAGS
LDSHARED = @LDSHARED@ #{defflag} LDSHARED = @LDSHARED@ #{defflag}
", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ") ", if $static then "" else "@CCDLFLAGS@" end, $defs.join(" ")

2
io.c
View File

@ -1195,7 +1195,9 @@ rb_io_fptr_cleanup(fptr, fin)
int fin; int fin;
{ {
if (fptr->mode & FMODE_FDOPEN) { if (fptr->mode & FMODE_FDOPEN) {
if (fptr->mode & FMODE_WRITABLE) {
io_fflush(GetWriteFile(fptr), fptr); io_fflush(GetWriteFile(fptr), fptr);
}
return; return;
} }
if (fptr->finalize) { if (fptr->finalize) {

6
lib/mkmf.rb
View File

@ -81,8 +81,8 @@ if /mswin32/ =~ RUBY_PLATFORM
else else
OUTFLAG = '-o ' OUTFLAG = '-o '
end end
LINK = "#{CONFIG['CC']} #{OUTFLAG}conftest -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}" LINK = "#{CONFIG['CC']} #{OUTFLAG}conftest -I#{$hdrdir} #{CFLAGS} %s %s #{CONFIG['LDFLAGS']} %s conftest.c %s %s #{CONFIG['LIBS']}"
CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} -I#{CONFIG['includedir']} %s %s conftest.c" CPP = "#{CONFIG['CPP']} -E %s -I#{$hdrdir} #{CFLAGS} %s %s conftest.c"
def rm_f(*files) def rm_f(*files)
targets = [] targets = []
@ -485,7 +485,7 @@ VPATH = $(srcdir)
CC = #{CONFIG["CC"]} CC = #{CONFIG["CC"]}
CFLAGS = #{CONFIG["CCDLFLAGS"]} #{CFLAGS} #{$CFLAGS} CFLAGS = #{CONFIG["CCDLFLAGS"]} #{CFLAGS} #{$CFLAGS}
CPPFLAGS = -I. -I$(hdrdir) -I$(srcdir) -I#{CONFIG["includedir"]} #{$defs.join(" ")} #{CONFIG["CPPFLAGS"]} #{$CPPFLAGS} CPPFLAGS = -I. -I$(hdrdir) -I$(srcdir) #{$defs.join(" ")} #{CONFIG["CPPFLAGS"]} #{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS} DLDFLAGS = #{$DLDFLAGS} #{$LDFLAGS}
LDSHARED = #{CONFIG["LDSHARED"]} #{defflag} LDSHARED = #{CONFIG["LDSHARED"]} #{defflag}