Commit a238d6e2 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

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
parent 9dfa790f

configure.in

+5 −0
Original line number Diff line number Diff line
@@ -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)

scripts/Makefile.am

+10 −4
Original line number Diff line number Diff line
@@ -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@!' \

scripts/mysqlbug.sh

+4 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ VERSION="@VERSION@@MYSQL_SERVER_SUFFIX@" 
COMPILATION_COMMENT="@COMPILATION_COMMENT@"

BUGmysql="mysql@lists.mysql.com"

# 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"`