Commit c9149b9c authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
parents bf3561ea 7fb6aa34

scripts/make_binary_distribution.sh

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ BASE=$BASE2 
#



if [ x"@GXX@" = x"yes" ] ; then

  gcclib=`@CC@ --print-libgcc-file`

  gcclib=`@CC@ @CFLAGS@ --print-libgcc-file`

  if [ $? -ne 0 ] ; then

    echo "Warning: Couldn't find libgcc.a!"

  else

support-files/mysql.spec.sh

+6 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/ 
# Include libgcc.a in the devel subpackage (BUG 4921)

if expr "$CC" : ".*gcc.*" > /dev/null ;

then

  libgcc=`$CC --print-libgcc-file`

  libgcc=`$CC $CFLAGS --print-libgcc-file`

  if [ -f $libgcc ]

  then

    %define have_libgcc 1
@@ -726,6 +726,11 @@ fi 
# itself - note that they must be ordered by date (important when

# merging BK trees)

%changelog 

* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>



- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the

  correct "libgcc.a" path is returned for the 32/64 bit architecture.



* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>



- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"