Skip to content

M
mariadb
Commit 9f353c22 authored by unknown's avatar unknown
Browse files
Options

Merge sinisa@bk-internal.mysql.com:/home/bk/mysql-4.0 

into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents 628b5c39 8a1a63de
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 105 deletions
support-files/MySQL-shared-compat.spec.sh
View file @ 9f353c22
...@@ -69,4 +69,4 @@ rpm2cpio %{SOURCE1} | cpio -iv --make-directories ...@@ -69,4 +69,4 @@ rpm2cpio %{SOURCE1} | cpio -iv --make-directories
%files %files
%defattr(-, root, root) %defattr(-, root, root)
/usr/lib/libmysqlclient* %{_libdir}/libmysqlclient*
support-files/mysql.spec.sh
View file @ 9f353c22
%define mysql_version @VERSION@ %define mysql_version @VERSION@
%define shared_lib_version @SHARED_LIB_VERSION@
%define release 0 %define release 0
%define mysqld_user mysql %define mysqld_user mysql
%define server_suffix -standard
%define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com %define see_base For a description of MySQL see the base MySQL RPM or http://www.mysql.com
...@@ -14,7 +14,6 @@ Version: @MYSQL_NO_DASH_VERSION@ ...@@ -14,7 +14,6 @@ Version: @MYSQL_NO_DASH_VERSION@
Release: %{release} Release: %{release}
Copyright: GPL Copyright: GPL
Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz Source: http://www.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/mysql-%{mysql_version}.tar.gz
Icon: mysql.gif
URL: http://www.mysql.com/ URL: http://www.mysql.com/
Packager: Lenz Grimmer <build@mysql.com> Packager: Lenz Grimmer <build@mysql.com>
Vendor: MySQL AB Vendor: MySQL AB
...@@ -194,6 +193,8 @@ BuildMySQL() { ...@@ -194,6 +193,8 @@ BuildMySQL() {
# The --enable-assembler simply does nothing on systems that does not # The --enable-assembler simply does nothing on systems that does not
# support assembler speedups. # support assembler speedups.
sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
CC=\"${CC:-$MYSQL_BUILD_CC}\" \
CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \
CFLAGS=\"${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS}\" \ CFLAGS=\"${MYSQL_BUILD_CFLAGS:-$RPM_OPT_FLAGS}\" \
CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \ CXXFLAGS=\"${MYSQL_BUILD_CXXFLAGS:-$RPM_OPT_FLAGS \
-felide-constructors -fno-exceptions -fno-rtti \ -felide-constructors -fno-exceptions -fno-rtti \
...@@ -206,13 +207,14 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \ ...@@ -206,13 +207,14 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
--with-unix-socket-path=/var/lib/mysql/mysql.sock \ --with-unix-socket-path=/var/lib/mysql/mysql.sock \
--prefix=/ \ --prefix=/ \
--with-extra-charsets=complex \ --with-extra-charsets=complex \
--exec-prefix=/usr \ --exec-prefix=%{_exec_prefix} \
--libexecdir=/usr/sbin \ --libexecdir=%{_sbindir} \
--sysconfdir=/etc \ --libdir=%{_libdir} \
--datadir=/usr/share \ --sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} \
--localstatedir=/var/lib/mysql \ --localstatedir=/var/lib/mysql \
--infodir=%{_infodir} \ --infodir=%{_infodir} \
--includedir=/usr/include \ --includedir=%{_includedir} \
--mandir=%{_mandir} \ --mandir=%{_mandir} \
--with-embedded-server \ --with-embedded-server \
--enable-thread-safe-client \ --enable-thread-safe-client \
...@@ -284,13 +286,15 @@ make distclean ...@@ -284,13 +286,15 @@ make distclean
mv Docs/manual.ps.save Docs/manual.ps mv Docs/manual.ps.save Docs/manual.ps
# RPM:s destroys Makefile.in files, so we generate them here # RPM:s destroys Makefile.in files, so we generate them here
automake # aclocal; autoheader; aclocal; automake; autoconf
# (cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
# Now build the statically linked 4.0 binary (which includes InnoDB) # Now build the statically linked 4.0 binary (which includes InnoDB)
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' \
$USE_OTHER_LIBC_DIR \ $USE_OTHER_LIBC_DIR \
--with-server-suffix='%{server_suffix}' \
--without-berkeley-db \ --without-berkeley-db \
--with-innodb \ --with-innodb \
--without-vio \ --without-vio \
...@@ -302,51 +306,54 @@ RBR=$RPM_BUILD_ROOT ...@@ -302,51 +306,54 @@ RBR=$RPM_BUILD_ROOT
MBD=$RPM_BUILD_DIR/mysql-%{mysql_version} MBD=$RPM_BUILD_DIR/mysql-%{mysql_version}
# Ensure that needed directories exists # Ensure that needed directories exists
install -d $RBR/etc/{logrotate.d,init.d} install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
install -d $RBR/var/lib/mysql/mysql install -d $RBR/var/lib/mysql/mysql
install -d $RBR/usr/share/{sql-bench,mysql-test} install -d $RBR%{_datadir}/{sql-bench,mysql-test}
install -d $RBR%{_includedir}
install -d $RBR%{_libdir}
install -d $RBR%{_mandir} install -d $RBR%{_mandir}
install -d $RBR/usr/{sbin,lib,include} install -d $RBR%{_sbindir}
# Install all binaries stripped # Install all binaries stripped
make install-strip DESTDIR=$RBR benchdir_root=/usr/share/ make install-strip DESTDIR=$RBR benchdir_root=%{_datadir}
# Install shared libraries (Disable for architectures that don't support it) # Install shared libraries (Disable for architectures that don't support it)
(cd $RBR/usr/lib; tar xf $RBR/shared-libs.tar) (cd $RBR%{_libdir}; tar xf $RBR/shared-libs.tar)
# install saved mysqld-max # install saved mysqld-max
install -s -m755 $MBD/sql/mysqld-max $RBR/usr/sbin/mysqld-max install -s -m755 $MBD/sql/mysqld-max $RBR%{_sbindir}/mysqld-max
# install symbol files ( for stack trace resolution) # install symbol files ( for stack trace resolution)
install -m644 $MBD/sql/mysqld-max.sym $RBR/usr/lib/mysql/mysqld-max.sym install -m644 $MBD/sql/mysqld-max.sym $RBR%{_libdir}/mysql/mysqld-max.sym
install -m644 $MBD/sql/mysqld.sym $RBR/usr/lib/mysql/mysqld.sym install -m644 $MBD/sql/mysqld.sym $RBR%{_libdir}/mysql/mysqld.sym
# Install logrotate and autostart # Install logrotate and autostart
install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql install -m644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
install -m755 $MBD/support-files/mysql.server $RBR/etc/init.d/mysql install -m755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
# Create a symlink "rcmysql", pointing to the init.script. SuSE users # Create a symlink "rcmysql", pointing to the init.script. SuSE users
# will appreciate that, as all services usually offer this. # will appreciate that, as all services usually offer this.
ln -s ../../etc/init.d/mysql $RPM_BUILD_ROOT/usr/sbin/rcmysql ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
# Create symbolic compatibility link safe_mysqld -> mysqld_safe # Create symbolic compatibility link safe_mysqld -> mysqld_safe
# (safe_mysqld will be gone in MySQL 4.1) # (safe_mysqld will be gone in MySQL 4.1)
ln -sf ./mysqld_safe $RBR/usr/bin/safe_mysqld ln -sf ./mysqld_safe $RBR%{_bindir}/safe_mysqld
# Touch the place where the my.cnf config file might be located # Touch the place where the my.cnf config file might be located
# Just to make sure it's in the file list and marked as a config file # Just to make sure it's in the file list and marked as a config file
touch $RBR/etc/my.cnf touch $RBR%{_sysconfdir}/my.cnf
%pre server %pre server
# Shut down a previously installed server first # Shut down a previously installed server first
if test -x /etc/init.d/mysql if test -x %{_sysconfdir}/init.d/mysql
then then
/etc/init.d/mysql stop > /dev/null 2>&1 %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1
echo "Giving mysqld a couple of seconds to exit nicely" echo "Giving mysqld a couple of seconds to exit nicely"
sleep 5 sleep 5
elif test -x /etc/rc.d/init.d/mysql elif test -x %{_sysconfdir}/rc.d/init.d/mysql
then then
/etc/rc.d/init.d/mysql stop > /dev/null 2>&1 %{_sysconfdir}/rc.d/init.d/mysql stop > /dev/null 2>&1
echo "Giving mysqld a couple of seconds to exit nicely" echo "Giving mysqld a couple of seconds to exit nicely"
sleep 5 sleep 5
fi fi
...@@ -363,7 +370,7 @@ if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi ...@@ -363,7 +370,7 @@ if test ! -d $mysql_datadir/test; then mkdir $mysql_datadir/test; fi
# use insserv for older SuSE Linux versions # use insserv for older SuSE Linux versions
if test -x /sbin/insserv if test -x /sbin/insserv
then then
/sbin/insserv /etc/init.d/mysql /sbin/insserv %{_sysconfdir}/init.d/mysql
# use chkconfig on Red Hat and newer SuSE releases # use chkconfig on Red Hat and newer SuSE releases
elif test -x /sbin/chkconfig elif test -x /sbin/chkconfig
then then
...@@ -389,7 +396,7 @@ chown -R mysql $mysql_datadir ...@@ -389,7 +396,7 @@ chown -R mysql $mysql_datadir
chmod -R og-rw $mysql_datadir/mysql chmod -R og-rw $mysql_datadir/mysql
# Restart in the same way that mysqld will be started normally. # Restart in the same way that mysqld will be started normally.
/etc/init.d/mysql start %{_sysconfdir}/init.d/mysql start
# Allow safe_mysqld to start mysqld and print a message before we exit # Allow safe_mysqld to start mysqld and print a message before we exit
sleep 2 sleep 2
...@@ -397,22 +404,22 @@ sleep 2 ...@@ -397,22 +404,22 @@ sleep 2
%post Max %post Max
# Restart mysqld, to use the new binary. # Restart mysqld, to use the new binary.
echo "Restarting mysqld." echo "Restarting mysqld."
/etc/init.d/mysql restart > /dev/null 2>&1 %{_sysconfdir}/init.d/mysql restart > /dev/null 2>&1
%preun server %preun server
if test $1 = 0 if test $1 = 0
then then
# Stop MySQL before uninstalling it # Stop MySQL before uninstalling it
if test -x /etc/init.d/mysql if test -x %{_sysconfdir}/init.d/mysql
then then
/etc/init.d/mysql stop > /dev/null %{_sysconfdir}/init.d/mysql stop > /dev/null
fi fi
# Remove autostart of mysql # Remove autostart of mysql
# for older SuSE Linux versions # for older SuSE Linux versions
if test -x /sbin/insserv if test -x /sbin/insserv
then then
/sbin/insserv -r /etc/init.d/mysql /sbin/insserv -r %{_sysconfdir}/init.d/mysql
# use chkconfig on Red Hat and newer SuSE releases # use chkconfig on Red Hat and newer SuSE releases
elif test -x /sbin/chkconfig elif test -x /sbin/chkconfig
then then
...@@ -445,54 +452,54 @@ fi ...@@ -445,54 +452,54 @@ fi
%doc %attr(644, root, man) %{_mandir}/man1/perror.1* %doc %attr(644, root, man) %{_mandir}/man1/perror.1*
%doc %attr(644, root, man) %{_mandir}/man1/replace.1* %doc %attr(644, root, man) %{_mandir}/man1/replace.1*
%ghost %config(noreplace,missingok) /etc/my.cnf %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
%attr(755, root, root) /usr/bin/isamchk %attr(755, root, root) %{_bindir}/isamchk
%attr(755, root, root) /usr/bin/isamlog %attr(755, root, root) %{_bindir}/isamlog
%attr(755, root, root) /usr/bin/my_print_defaults %attr(755, root, root) %{_bindir}/my_print_defaults
%attr(755, root, root) /usr/bin/myisamchk %attr(755, root, root) %{_bindir}/myisamchk
%attr(755, root, root) /usr/bin/myisamlog %attr(755, root, root) %{_bindir}/myisamlog
%attr(755, root, root) /usr/bin/myisampack %attr(755, root, root) %{_bindir}/myisampack
%attr(755, root, root) /usr/bin/mysql_convert_table_format %attr(755, root, root) %{_bindir}/mysql_convert_table_format
%attr(755, root, root) /usr/bin/mysql_explain_log %attr(755, root, root) %{_bindir}/mysql_explain_log
%attr(755, root, root) /usr/bin/mysql_fix_privilege_tables %attr(755, root, root) %{_bindir}/mysql_fix_privilege_tables
%attr(755, root, root) /usr/bin/mysql_install_db %attr(755, root, root) %{_bindir}/mysql_install_db
%attr(755, root, root) /usr/bin/mysql_secure_installation %attr(755, root, root) %{_bindir}/mysql_secure_installation
%attr(755, root, root) /usr/bin/mysql_setpermission %attr(755, root, root) %{_bindir}/mysql_setpermission
%attr(755, root, root) /usr/bin/mysql_zap %attr(755, root, root) %{_bindir}/mysql_zap
%attr(755, root, root) /usr/bin/mysqlbug %attr(755, root, root) %{_bindir}/mysqlbug
%attr(755, root, root) /usr/bin/mysqld_multi %attr(755, root, root) %{_bindir}/mysqld_multi
%attr(755, root, root) /usr/bin/mysqld_safe %attr(755, root, root) %{_bindir}/mysqld_safe
%attr(755, root, root) /usr/bin/mysqlhotcopy %attr(755, root, root) %{_bindir}/mysqlhotcopy
%attr(755, root, root) /usr/bin/mysqltest %attr(755, root, root) %{_bindir}/mysqltest
%attr(755, root, root) /usr/bin/pack_isam %attr(755, root, root) %{_bindir}/pack_isam
%attr(755, root, root) /usr/bin/perror %attr(755, root, root) %{_bindir}/perror
%attr(755, root, root) /usr/bin/replace %attr(755, root, root) %{_bindir}/replace
%attr(755, root, root) /usr/bin/resolve_stack_dump %attr(755, root, root) %{_bindir}/resolve_stack_dump
%attr(755, root, root) /usr/bin/resolveip %attr(755, root, root) %{_bindir}/resolveip
%attr(755, root, root) /usr/bin/safe_mysqld %attr(755, root, root) %{_bindir}/safe_mysqld
%attr(755, root, root) /usr/sbin/mysqld %attr(755, root, root) %{_sbindir}/mysqld
%attr(755, root, root) /usr/sbin/rcmysql %attr(755, root, root) %{_sbindir}/rcmysql
%attr(644, root, root) /usr/lib/mysql/mysqld.sym %attr(644, root, root) %{_libdir}/mysql/mysqld.sym
%attr(644, root, root) /etc/logrotate.d/mysql %attr(644, root, root) %{_sysconfdir}/logrotate.d/mysql
%attr(755, root, root) /etc/init.d/mysql %attr(755, root, root) %{_sysconfdir}/init.d/mysql
%attr(755, root, root) /usr/share/mysql/ %attr(755, root, root) %{_datadir}/mysql/
%files client %files client
%attr(755, root, root) /usr/bin/msql2mysql %attr(755, root, root) %{_bindir}/msql2mysql
%attr(755, root, root) /usr/bin/mysql %attr(755, root, root) %{_bindir}/mysql
%attr(755, root, root) /usr/bin/mysql_find_rows %attr(755, root, root) %{_bindir}/mysql_find_rows
%attr(755, root, root) /usr/bin/mysql_waitpid %attr(755, root, root) %{_bindir}/mysql_waitpid
%attr(755, root, root) /usr/bin/mysqlaccess %attr(755, root, root) %{_bindir}/mysqlaccess
%attr(755, root, root) /usr/bin/mysqladmin %attr(755, root, root) %{_bindir}/mysqladmin
%attr(755, root, root) /usr/bin/mysqlbinlog %attr(755, root, root) %{_bindir}/mysqlbinlog
%attr(755, root, root) /usr/bin/mysqlcheck %attr(755, root, root) %{_bindir}/mysqlcheck
%attr(755, root, root) /usr/bin/mysqldump %attr(755, root, root) %{_bindir}/mysqldump
%attr(755, root, root) /usr/bin/mysqlimport %attr(755, root, root) %{_bindir}/mysqlimport
%attr(755, root, root) /usr/bin/mysqlshow %attr(755, root, root) %{_bindir}/mysqlshow
%doc %attr(644, root, man) %{_mandir}/man1/mysql.1* %doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1* %doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
...@@ -508,45 +515,57 @@ fi ...@@ -508,45 +515,57 @@ fi
%files devel %files devel
%defattr(644 root, root) %defattr(644 root, root)
%attr(755, root, root) /usr/bin/comp_err %attr(755, root, root) %{_bindir}/comp_err
%attr(755, root, root) /usr/bin/mysql_config %attr(755, root, root) %{_bindir}/mysql_config
%dir %attr(755, root, root) /usr/include/mysql %dir %attr(755, root, root) %{_includedir}/mysql
%dir %attr(755, root, root) /usr/lib/mysql %dir %attr(755, root, root) %{_libdir}/mysql
/usr/include/mysql/* %{_includedir}/mysql/*
/usr/lib/mysql/libdbug.a %{_libdir}/mysql/libdbug.a
/usr/lib/mysql/libheap.a %{_libdir}/mysql/libheap.a
/usr/lib/mysql/libmerge.a %{_libdir}/mysql/libmerge.a
/usr/lib/mysql/libmyisam.a %{_libdir}/mysql/libmyisam.a
/usr/lib/mysql/libmyisammrg.a %{_libdir}/mysql/libmyisammrg.a
/usr/lib/mysql/libmysqlclient.a %{_libdir}/mysql/libmysqlclient.a
/usr/lib/mysql/libmysqlclient.la %{_libdir}/mysql/libmysqlclient.la
/usr/lib/mysql/libmysqlclient_r.a %{_libdir}/mysql/libmysqlclient_r.a
/usr/lib/mysql/libmysqlclient_r.la %{_libdir}/mysql/libmysqlclient_r.la
/usr/lib/mysql/libmystrings.a %{_libdir}/mysql/libmystrings.a
/usr/lib/mysql/libmysys.a %{_libdir}/mysql/libmysys.a
/usr/lib/mysql/libnisam.a %{_libdir}/mysql/libnisam.a
/usr/lib/mysql/libvio.a %{_libdir}/mysql/libvio.a
%files shared %files shared
%defattr(755 root, root) %defattr(755 root, root)
# Shared libraries (omit for architectures that don't support them) # Shared libraries (omit for architectures that don't support them)
/usr/lib/*.so* %{_libdir}/*.so*
%files bench %files bench
%attr(-, root, root) /usr/share/sql-bench %attr(-, root, root) %{_datadir}/sql-bench
%attr(-, root, root) /usr/share/mysql-test %attr(-, root, root) %{_datadir}/mysql-test
%attr(755, root, root) /usr/bin/mysqlmanager %attr(755, root, root) %{_bindir}/mysqlmanager
%attr(755, root, root) /usr/bin/mysqlmanager-pwgen %attr(755, root, root) %{_bindir}/mysqlmanager-pwgen
%attr(755, root, root) /usr/bin/mysqlmanagerc %attr(755, root, root) %{_bindir}/mysqlmanagerc
%files Max %files Max
%attr(755, root, root) /usr/sbin/mysqld-max %attr(755, root, root) %{_sbindir}/mysqld-max
%attr(644, root, root) /usr/lib/mysql/mysqld-max.sym %attr(644, root, root) %{_libdir}/mysql/mysqld-max.sym
%files embedded %files embedded
%attr(644, root, root) /usr/lib/mysql/libmysqld.a %attr(644, root, root) %{_libdir}/mysql/libmysqld.a
%changelog %changelog
* Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com>
- removed the GIF Icon (file was not included in the sources anyway)
- removed unused variable %shared_lib_version
- do not run automake before building the standard binary
(should not be necessary)
- add server suffix '-standard' to standard binary (to be in line
with the binary tarball distributions)
- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
_datadir, _includedir) throughout the spec file.
- allow overriding CC and CXX (required when building with other compilers)
* Fri May 16 2003 Lenz Grimmer <lenz@mysql.com> * Fri May 16 2003 Lenz Grimmer <lenz@mysql.com>
- re-enabled RAID again - re-enabled RAID again
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7