[前][次][番号順一覧][スレッド一覧]

ruby-changes:11516

From: nobu <ko1@a...>
Date: Mon, 6 Apr 2009 20:16:29 +0900 (JST)
Subject: [ruby-changes:11516] Ruby:r23142 (ruby_1_8, trunk): * configure.in (CFLAGS, CXXFLAGS): use orignal values if given.

nobu	2009-04-06 20:16:15 +0900 (Mon, 06 Apr 2009)

  New Revision: 23142

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23142

  Log:
    * configure.in (CFLAGS, CXXFLAGS): use orignal values if given.
      [ruby-core:23130]

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/configure.in
    branches/ruby_1_8/version.h
    trunk/ChangeLog
    trunk/configure.in

Index: configure.in
===================================================================
--- configure.in	(revision 23141)
+++ configure.in	(revision 23142)
@@ -214,8 +214,14 @@
 
 dnl Checks for programs.
 
-: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'}
-: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'}
+if test -z "${CFLAGS+set}"; then
+    orig_cflags="$cflags"
+    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'}
+fi
+if test -z "${CXXFLAGS+set}"; then
+    orig_cxxflags="$cxxflags"
+    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'}
+fi
 if test x"${build}" != x"${host}"; then
   AC_CHECK_TOOL(CC, gcc)
 fi
@@ -341,8 +347,8 @@
     warnflags="-Wall -Wno-unused-parameter -Wno-parentheses ${warnflags+$warnflags }-Wpointer-arith -Wwrite-strings"
 fi
 
-CFLAGS="${CFLAGS} `eval echo $cflags`"
-CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
+test -n "${cflags+set}" && CFLAGS="${CFLAGS} `eval echo $cflags`"
+test -n "${cxxflags+set}" && CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
 
 dnl check for large file stuff
 mv confdefs.h confdefs1.h
@@ -2198,17 +2204,23 @@
 
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g'`
-CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'`
+if test -n "${cflags+set}"; then
+    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'`
+fi
+if test -n "${cxxflags+set}"; then
+    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'`
+fi
 if test "${ARCH_FLAG}"; then
     archflagpat=`eval echo '"'"${ARCH_FLAG}"'"' | sed 's/[[][|.*]]/\\&/g'`
     CFLAGS=`echo "$CFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
     LDFLAGS=`echo "$LDFLAGS" | sed "s|$archflagpat"'|$(ARCH_FLAG)|'`
 fi
-cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g'`
-CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'`
 AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
 AC_SUBST(optflags)dnl
 AC_SUBST(debugflags)dnl
 AC_SUBST(warnflags)dnl
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23141)
+++ ChangeLog	(revision 23142)
@@ -1,3 +1,8 @@
+Mon Apr  6 20:16:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (CFLAGS, CXXFLAGS): use orignal values if given.
+	  [ruby-core:23130]
+
 Mon Apr  6 19:26:18 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* file.c (utime_failed): refined the error message for EINVAL on
Index: ruby_1_8/configure.in
===================================================================
--- ruby_1_8/configure.in	(revision 23141)
+++ ruby_1_8/configure.in	(revision 23142)
@@ -148,8 +148,14 @@
 
 dnl Checks for programs.
 
-: ${CFLAGS=} ${cflags='${optflags} ${debugflags} ${warnflags}'}
-: ${CXXFLAGS=} ${cxxflags='${optflags} ${debugflags} ${warnflags}'}
+if test -z "${CFLAGS+set}"; then
+    orig_cflags="$cflags"
+    cflags="$cflags "'${optflags} ${debugflags} ${warnflags}'}
+fi
+if test -z "${CXXFLAGS+set}"; then
+    orig_cxxflags="$cxxflags"
+    cxxflags="$cxxflags "'${optflags} ${debugflags} ${warnflags}'}
+fi
 if test x"${build}" != x"${host}"; then
   AC_CHECK_TOOL(CC, gcc)
 fi
@@ -162,8 +168,8 @@
 else
     linker_flag=
 fi
-CFLAGS="${CFLAGS} `eval echo $cflags`"
-CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
+test -n "${cflags+set}" && CFLAGS="${CFLAGS} `eval echo $cflags`"
+test -n "${cxxflags+set}" && CXXFLAGS="${CXXFLAGS} `eval echo $cxxflags`"
 
 RUBY_PROG_GNU_LD
 RUBY_CPPOUTFILE
@@ -1703,12 +1709,17 @@
 
 CPPFLAGS="$CPPFLAGS "'$(DEFS)'
 test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
-cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[][|.*]/\\&/g'`
-CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'`
-cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[][|.*]/\\&/g'`
-CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'`
+if test -n "${cflags+set}"; then
+    cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CFLAGS=`echo "$CFLAGS" | sed "s|$cflagspat"'|${cflags}|'`
+fi
+if test -n "${cxxflags+set}"; then
+    cxxflagspat=`eval echo '"'"${cxxflags}"'"' | sed 's/[[][|.*]]/\\&/g'`
+    CXXFLAGS=`echo "$CXXFLAGS" | sed "s|$cxxflagspat"'|${cxxflags}|'`
+fi
 AC_SUBST(cppflags, [])dnl
-AC_SUBST(cflags, ['${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
+AC_SUBST(cxxflags, ["$orig_cxxflags "'${optflags} ${debugflags} ${warnflags}'])dnl
 AC_SUBST(optflags)dnl
 AC_SUBST(debugflags)dnl
 AC_SUBST(warnflags)dnl
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 23141)
+++ ruby_1_8/ChangeLog	(revision 23142)
@@ -1,3 +1,8 @@
+Mon Apr  6 20:16:14 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (CFLAGS, CXXFLAGS): use orignal values if given.
+	  [ruby-core:23130]
+
 Fri Apr  3 18:37:59 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (Init_stack): use ruby_init_stack.  [ruby-dev:34350]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 23141)
+++ ruby_1_8/version.h	(revision 23142)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-04-03"
+#define RUBY_RELEASE_DATE "2009-04-06"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090403
+#define RUBY_RELEASE_CODE 20090406
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 6
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]