From: Joerg Bruehe Date: October 18 2007 10:03am Subject: bk commit into 5.0 tree (joerg:1.2538) BUG#31644 List-Archive: http://lists.mysql.com/commits/35820 X-Bug: 31644 Message-Id: <20071018100337.5144019AD@trift2.fambruehe> Below is the list of changes that have just been committed into a local 5.0 repository of joerg. When joerg does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository. For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html ChangeSet@stripped, 2007-10-18 12:03:30+02:00, joerg@trift2. +3 -0 Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original and the modified values of the compile-related variables used in "configure". Make the necessary adjustments in "configure.in" and "scripts/Makefile.am". This fixes bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug configure.in@stripped, 2007-10-18 12:03:27+02:00, joerg@trift2. +5 -0 Add more variables to the "substitution" list: SAVE_CC, SAVE_CXX, ASFLAGS. This is necessary so that the "mysqlbug" script can output the variables affecting compilation with both their original (on call) and final (modified) values. This work is related to fixing bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug scripts/Makefile.am@stripped, 2007-10-18 12:03:27+02:00, joerg@trift2. +10 -4 Clearly differ between the original and the modified values of the compile-related variables used in "configure". This is to fix bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug scripts/mysqlbug.sh@stripped, 2007-10-18 12:03:27+02:00, joerg@trift2. +4 -2 Have separate variables "COMP_CALL_INFO" and "COMP_RUN_INFO" which contain the original (call parameters, environment) and the modified values of the "configure" variables controlling the compile process. This fixes bug#31644 Values of *FLAGS that were used for building packages is missed in mysqlbug diff -Nrup a/configure.in b/configure.in --- a/configure.in 2007-10-15 19:59:10 +02:00 +++ b/configure.in 2007-10-18 12:03:27 +02:00 @@ -124,6 +124,8 @@ case $MACHINE_TYPE in esac # Save some variables and the command line options for mysqlbug +SAVE_CC="$CC" +SAVE_CXX="$CXX" SAVE_ASFLAGS="$ASFLAGS" SAVE_CFLAGS="$CFLAGS" SAVE_CXXFLAGS="$CXXFLAGS" @@ -131,6 +133,8 @@ SAVE_LDFLAGS="$LDFLAGS" SAVE_CXXLDFLAGS="$CXXLDFLAGS" CONF_COMMAND="$0 $ac_configure_args" AC_SUBST(CONF_COMMAND) +AC_SUBST(SAVE_CC) +AC_SUBST(SAVE_CXX) AC_SUBST(SAVE_ASFLAGS) AC_SUBST(SAVE_CFLAGS) AC_SUBST(SAVE_CXXFLAGS) @@ -373,6 +377,7 @@ AC_SUBST(CC) AC_SUBST(CFLAGS) AC_SUBST(CXX) AC_SUBST(CXXFLAGS) +AC_SUBST(ASFLAGS) AC_SUBST(LD) AC_SUBST(INSTALL_SCRIPT) diff -Nrup a/scripts/Makefile.am b/scripts/Makefile.am --- a/scripts/Makefile.am 2007-08-14 00:02:56 +02:00 +++ b/scripts/Makefile.am 2007-10-18 12:03:27 +02:00 @@ -149,13 +149,19 @@ SUFFIXES = .sh -e 's!@''CC''@!@CC@!'\ -e 's!@''CXX''@!@CXX@!'\ -e 's!@''GXX''@!@GXX@!'\ + -e 's!@''SAVE_CC''@!@SAVE_CC@!'\ + -e 's!@''SAVE_CXX''@!@SAVE_CXX@!'\ -e 's!@''CC_VERSION''@!@CC_VERSION@!'\ -e 's!@''CXX_VERSION''@!@CXX_VERSION@!'\ -e 's!@''PERL''@!@PERL@!' \ - -e 's!@''ASFLAGS''@!@SAVE_ASFLAGS@!'\ - -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\ - -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ - -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\ + -e 's!@''SAVE_ASFLAGS''@!@SAVE_ASFLAGS@!'\ + -e 's!@''SAVE_CFLAGS''@!@SAVE_CFLAGS@!'\ + -e 's!@''SAVE_CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ + -e 's!@''SAVE_LDFLAGS''@!@SAVE_LDFLAGS@!'\ + -e 's!@''ASFLAGS''@!@ASFLAGS@!'\ + -e 's!@''CFLAGS''@!@CFLAGS@!'\ + -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\ + -e 's!@''LDFLAGS''@!@LDFLAGS@!'\ -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \ -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \ diff -Nrup a/scripts/mysqlbug.sh b/scripts/mysqlbug.sh --- a/scripts/mysqlbug.sh 2007-01-11 15:40:02 +01:00 +++ b/scripts/mysqlbug.sh 2007-10-18 12:03:27 +02:00 @@ -23,7 +23,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@" COMPILATION_COMMENT="@COMPILATION_COMMENT@" BUGmysql="mysql@stripped" # This is set by configure -COMP_ENV_INFO="CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'" +COMP_CALL_INFO="CC='@SAVE_CC@' CFLAGS='@SAVE_CFLAGS@' CXX='@SAVE_CXX@' CXXFLAGS='@SAVE_CXXFLAGS@' LDFLAGS='@SAVE_LDFLAGS@' ASFLAGS='@SAVE_ASFLAGS@'" +COMP_RUN_INFO="CC='@CC@' CFLAGS='@CFLAGS@' CXX='@CXX@' CXXFLAGS='@CXXFLAGS@' LDFLAGS='@LDFLAGS@' ASFLAGS='@ASFLAGS@'" CONFIGURE_LINE="@CONF_COMMAND@" LIBC_INFO="" @@ -261,7 +262,8 @@ ${ORGANIZATION- $ORGANIZATION_C} `test -n "$MACHINE" && echo "Machine: $MACHINE"` `test -n "$FILE_PATHS" && echo "Some paths: $FILE_PATHS"` `test -n "$GCC_INFO" && echo "GCC: $GCC_INFO"` -`test -n "$COMP_ENV_INFO" && echo "Compilation info: $COMP_ENV_INFO"` +`test -n "$COMP_CALL_INFO" && echo "Compilation info (call): $COMP_CALL_INFO"` +`test -n "$COMP_RUN_INFO" && echo "Compilation info (used): $COMP_RUN_INFO"` `test -n "$LIBC_INFO" && echo "LIBC: $LIBC_INFO"` `test -n "$CONFIGURE_LINE" && echo "Configure command: $CONFIGURE_LINE"` `test -n "$PERL_INFO" && echo "Perl: $PERL_INFO"`