ruby-changes:2204
From: ko1@a...
Date: 14 Oct 2007 04:08:55 +0900
Subject: [ruby-changes:2204] nobu - Ruby:r13695 (ruby_1_8, trunk): * configure.in (AC_SYS_LARGEFILE): keep results also in command
nobu 2007-10-14 04:08:37 +0900 (Sun, 14 Oct 2007)
New Revision: 13695
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/configure.in
branches/ruby_1_8/lib/mkmf.rb
branches/ruby_1_8/mkconfig.rb
trunk/ChangeLog
trunk/configure.in
trunk/lib/mkmf.rb
trunk/mkconfig.rb
Log:
* configure.in (AC_SYS_LARGEFILE): keep results also in command
options, to vail out of mismatch. [ruby-list:44114]
* mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/mkmf.rb?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/configure.in?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/mkmf.rb?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/mkconfig.rb?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/configure.in?r1=13695&r2=13694
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/mkconfig.rb?r1=13695&r2=13694
Index: configure.in
===================================================================
--- configure.in (revision 13694)
+++ configure.in (revision 13695)
@@ -242,7 +242,12 @@
AC_SUBST(MAKEDIRS)
dnl check for large file stuff
+mv confdefs.h confdefs1.h
+: > confdefs.h
AC_SYS_LARGEFILE
+mv confdefs.h largefile.h
+mv confdefs1.h confdefs.h
+cat largefile.h >> confdefs.h
case "$target_os" in
mingw*)
@@ -1510,6 +1515,7 @@
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
esac
+CPPFLAGS="$CPPFLAGS "'$(DEFS)'
AC_SUBST(XCFLAGS)dnl
AC_SUBST(XLDFLAGS)dnl
AC_SUBST(LIBRUBY_LDSHARED)
@@ -1663,7 +1669,7 @@
echo "creating config.h"
tr -d '\015' < confdefs.h > "${config_h}"
fi
-: > confdefs.h
+tr -d '\015' < largefile.h > confdefs.h
AC_CONFIG_FILES($FIRSTMAKEFILE)
AC_CONFIG_FILES(Makefile, [{
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13694)
+++ ChangeLog (revision 13695)
@@ -1,3 +1,10 @@
+Sun Oct 14 04:08:34 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * configure.in (AC_SYS_LARGEFILE): keep results also in command
+ options, to vail out of mismatch. [ruby-list:44114]
+
+ * mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
+
Sun Oct 14 03:55:52 2007 Nobuyoshi Nakada <nobu@r...>
* win32/mkexports.rb: deal with __fastcall name decorations.
Index: mkconfig.rb
===================================================================
--- mkconfig.rb (revision 13694)
+++ mkconfig.rb (revision 13695)
@@ -68,7 +68,7 @@
end
if name
- next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
+ next if /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
next if /^\$\(ac_\w+\)$/ =~ val
next if /^\$\{ac_\w+\}$/ =~ val
next if /^\$ac_\w+$/ =~ val
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb (revision 13694)
+++ lib/mkmf.rb (revision 13695)
@@ -1184,6 +1184,7 @@
RUBY_EXTCONF_H = #{$extconf_h}
CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
INCFLAGS = -I. #$INCFLAGS
+DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in (revision 13694)
+++ ruby_1_8/configure.in (revision 13695)
@@ -234,7 +234,12 @@
fi
dnl check for large file stuff
+mv confdefs.h confdefs1.h
+: > confdefs.h
AC_SYS_LARGEFILE
+mv confdefs.h largefile.h
+mv confdefs1.h confdefs.h
+cat largefile.h >> confdefs.h
AC_CHECK_TYPES([long long, off_t])
@@ -1504,6 +1509,7 @@
*msdosdjgpp*) FIRSTMAKEFILE=GNUmakefile:djgpp/GNUmakefile.in;;
esac
+CPPFLAGS="$CPPFLAGS "'$(DEFS)'
AC_SUBST(XCFLAGS)dnl
AC_SUBST(XLDFLAGS)dnl
AC_SUBST(LIBRUBY_LDSHARED)
@@ -1640,7 +1646,7 @@
echo "creating config.h"
tr -d '\015' < confdefs.h > config.h
fi
-: > confdefs.h
+tr -d '\015' < largefile.h > confdefs.h
AC_CONFIG_FILES($FIRSTMAKEFILE)
AC_CONFIG_FILES(Makefile, [{
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 13694)
+++ ruby_1_8/ChangeLog (revision 13695)
@@ -1,3 +1,10 @@
+Sun Oct 14 04:08:34 2007 Nobuyoshi Nakada <nobu@r...>
+
+ * configure.in (AC_SYS_LARGEFILE): keep results also in command
+ options, to vail out of mismatch. [ruby-list:44114]
+
+ * mkconfig.rb, lib/mkmf.rb (configuration): add DEFS.
+
Sun Oct 14 03:55:52 2007 Nobuyoshi Nakada <nobu@r...>
* win32/mkexports.rb: deal with __fastcall name decorations.
Index: ruby_1_8/mkconfig.rb
===================================================================
--- ruby_1_8/mkconfig.rb (revision 13694)
+++ ruby_1_8/mkconfig.rb (revision 13695)
@@ -68,7 +68,7 @@
end
if name
- next if /^(?:ac_.*|DEFS|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
+ next if /^(?:ac_.*|configure_input|(?:top_)?srcdir|\w+OBJS)$/ =~ name
next if /^\$\(ac_\w+\)$/ =~ val
next if /^\$\{ac_\w+\}$/ =~ val
next if /^\$ac_\w+$/ =~ val
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb (revision 13694)
+++ ruby_1_8/lib/mkmf.rb (revision 13695)
@@ -1156,6 +1156,7 @@
RUBY_EXTCONF_H = #{$extconf_h}
CFLAGS = #{$static ? '' : CONFIG['CCDLFLAGS']} #$CFLAGS #$ARCH_FLAG
INCFLAGS = -I. #$INCFLAGS
+DEFS = #{CONFIG['DEFS']}
CPPFLAGS = #{extconf_h}#{$CPPFLAGS}
CXXFLAGS = $(CFLAGS) #{CONFIG['CXXFLAGS']}
DLDFLAGS = #$LDFLAGS #$DLDFLAGS #$ARCH_FLAG
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml