Commit 021aa7ca authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixes for RPM build

parent ae2893b2

Build-tools/Do-rpm

+1 −3
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ if [ $? != 0 ]; then 
 tail $log

fi 



if [ ! x$local_build=x1 ]; then

if [ x$local_build != x1 ]; then



 # Build perl RPM (we currently need to be root to do this and that is

 # not possible)
@@ -228,5 +228,3 @@ if [ ! x$local_build=x1 ]; then 
 #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS

fi 

)  > $log 2>&1

acinclude.m4

+5 −5
Original line number Diff line number Diff line
@@ -1054,9 +1054,9 @@ dnl --------------------------------------------------------------------------- 
AC_DEFUN([MYSQL_CHECK_INNODB], [

  AC_ARG_WITH([innodb],

              [\

  --with-innodb         Use Innodb],

  --without-innodb        Do not include the InnoDB table handler],

              [innodb="$withval"],

              [innodb=no])

              [innodb=yes])



  AC_MSG_CHECKING([for Innodb])

configure.in

+2 −3
Original line number Diff line number Diff line
@@ -1752,8 +1752,7 @@ AC_ARG_WITH(embedded-server, 
)



AC_ARG_WITH(extra-tools,

    [  --without-extra-tools        Skip building utilites in the tools \

     directory.],

    [  --without-extra-tools   Skip building utilites in the tools directory.],

    [with_tools=$withval],

    [with_tools=yes]

)

support-files/mysql.spec.sh

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ automake 
BuildMySQL "--disable-shared" \

	   "--with-mysqld-ldflags='-all-static'" \

	   "--with-client-ldflags='-all-static'" \

	   "--without-berkeley-db --without-innodb"

	   "--without-berkeley-db --with-innodb"

nm --numeric-sort sql/mysqld > sql/mysqld.sym



%install -n mysql-%{mysql_version}