database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Fixes for RPM build

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2001-09-29 00:44:23 +03:00
parent ae2893b221
commit 021aa7caac
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Build-tools/Do-rpm
View File

@@ -210,7 +210,7 @@ if [ $? != 0 ]; then
tail $log tail $log
fi 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 # Build perl RPM (we currently need to be root to do this and that is
# not possible) # not possible)
@@ -228,5 +228,3 @@ if [ ! x$local_build=x1 ]; then
#scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS #scp $owner@$bmachine:$rpmdir/SRPMS/Perl*-*.rpm $bpath/NEW-RPMS
fi fi
) > $log 2>&1 ) > $log 2>&1

4
acinclude.m4
View File

@@ -1054,9 +1054,9 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([MYSQL_CHECK_INNODB], [ AC_DEFUN([MYSQL_CHECK_INNODB], [
AC_ARG_WITH([innodb], AC_ARG_WITH([innodb],
[\ [\
--with-innodb Use Innodb], --without-innodb Do not include the InnoDB table handler],
[innodb="$withval"], [innodb="$withval"],
[innodb=no]) [innodb=yes])
AC_MSG_CHECKING([for Innodb]) AC_MSG_CHECKING([for Innodb])

3
configure.in
View File

@@ -1752,8 +1752,7 @@ AC_ARG_WITH(embedded-server,
) )
AC_ARG_WITH(extra-tools, AC_ARG_WITH(extra-tools,
[ --without-extra-tools Skip building utilites in the tools \ [ --without-extra-tools Skip building utilites in the tools directory.],
directory.],
[with_tools=$withval], [with_tools=$withval],
[with_tools=yes] [with_tools=yes]
) )

2
support-files/mysql.spec.sh
View File

@@ -219,7 +219,7 @@ automake
BuildMySQL "--disable-shared" \ BuildMySQL "--disable-shared" \
"--with-mysqld-ldflags='-all-static'" \ "--with-mysqld-ldflags='-all-static'" \
"--with-client-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 nm --numeric-sort sql/mysqld > sql/mysqld.sym
%install -n mysql-%{mysql_version} %install -n mysql-%{mysql_version}