mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 10:14:19 +01:00
make_win_src_distribution.sh:
Removed reference to missing "tools" directory mysql.spec.sh: Changed flag --with-yassl => --with-ssl Reverted accidental removal of the "make" call :-) Configure --with-embedded-server Corrected path to "libtool" command Corrected path to "libmysqld.a" Removed references to "safe_mysqld" support-files/mysql.spec.sh: Changed flag --with-yassl => --with-ssl Reverted accidental removal of the "make" call :-) Configure --with-embedded-server Corrected path to "libtool" command Corrected path to "libmysqld.a" Removed references to "safe_mysqld" scripts/make_win_src_distribution.sh: Removed reference to missing "tools" directory
This commit is contained in:
parent
a25fc95dd9
commit
d556631bff
2 changed files with 8 additions and 12 deletions
|
@ -256,7 +256,7 @@ copy_dir_dirs() {
|
|||
for i in client dbug extra storage/heap include storage/archive storage/csv \
|
||||
include/mysql libmysql libmysqld storage/myisam storage/example \
|
||||
storage/myisammrg mysys regex sql strings sql-common \
|
||||
tools vio zlib
|
||||
vio zlib
|
||||
do
|
||||
copy_dir_files $i
|
||||
done
|
||||
|
|
|
@ -221,7 +221,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||
--prefix=/ \
|
||||
--with-extra-charsets=all \
|
||||
%if %{YASSL_BUILD}
|
||||
--with-yassl \
|
||||
--with-ssl \
|
||||
%endif
|
||||
--exec-prefix=%{_exec_prefix} \
|
||||
--libexecdir=%{_sbindir} \
|
||||
|
@ -235,6 +235,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||
--enable-thread-safe-client \
|
||||
--with-readline \
|
||||
"
|
||||
make
|
||||
}
|
||||
|
||||
# Use our own copy of glibc
|
||||
|
@ -350,6 +351,7 @@ BuildMySQL "--enable-shared \
|
|||
--with-example-storage-engine \
|
||||
--with-blackhole-storage-engine \
|
||||
--with-federated-storage-engine \
|
||||
--with-embedded-server \
|
||||
--with-big-tables \
|
||||
--with-comment=\"MySQL Community Server (GPL)\"")
|
||||
|
||||
|
@ -389,10 +391,10 @@ install -d $RBR%{_sbindir}
|
|||
mv $RBR/%{_libdir}/mysql/*.so* $RBR/%{_libdir}/
|
||||
|
||||
# install "mysqld-debug" and "mysqld-max"
|
||||
./libtool --mode=execute install -m 755 \
|
||||
$MBD/libtool --mode=execute install -m 755 \
|
||||
$RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-debug-%{mysql_version}/sql/mysqld \
|
||||
$RBR%{_sbindir}/mysqld-debug
|
||||
./libtool --mode=execute install -m 755 \
|
||||
$MBD/libtool --mode=execute install -m 755 \
|
||||
$RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-max-%{mysql_version}/sql/mysqld \
|
||||
$RBR%{_sbindir}/mysqld-max
|
||||
|
||||
|
@ -404,16 +406,12 @@ install -m 644 $MBD/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.
|
|||
install -m 755 $MBD/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
|
||||
|
||||
# Install embedded server library in the build root
|
||||
install -m 644 libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
|
||||
install -m 644 $MBD/libmysqld/libmysqld.a $RBR%{_libdir}/mysql/
|
||||
|
||||
# Create a symlink "rcmysql", pointing to the init.script. SuSE users
|
||||
# will appreciate that, as all services usually offer this.
|
||||
ln -s %{_sysconfdir}/init.d/mysql $RPM_BUILD_ROOT%{_sbindir}/rcmysql
|
||||
|
||||
# Create symbolic compatibility link safe_mysqld -> mysqld_safe
|
||||
# (safe_mysqld will be gone in MySQL 4.1)
|
||||
ln -sf ./mysqld_safe $RBR%{_bindir}/safe_mysqld
|
||||
|
||||
# Touch the place where the my.cnf config file and mysqlmanager.passwd
|
||||
# (MySQL Instance Manager password file) might be located
|
||||
# Just to make sure it's in the file list and marked as a config file
|
||||
|
@ -480,7 +478,7 @@ chmod -R og-rw $mysql_datadir/mysql
|
|||
# Restart in the same way that mysqld will be started normally.
|
||||
%{_sysconfdir}/init.d/mysql start
|
||||
|
||||
# Allow safe_mysqld to start mysqld and print a message before we exit
|
||||
# Allow mysqld_safe to start mysqld and print a message before we exit
|
||||
sleep 2
|
||||
|
||||
|
||||
|
@ -542,7 +540,6 @@ fi
|
|||
%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.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/safe_mysqld.1*
|
||||
|
||||
%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
|
||||
%ghost %config(noreplace,missingok) %{_sysconfdir}/mysqlmanager.passwd
|
||||
|
@ -571,7 +568,6 @@ fi
|
|||
%attr(755, root, root) %{_bindir}/replace
|
||||
%attr(755, root, root) %{_bindir}/resolve_stack_dump
|
||||
%attr(755, root, root) %{_bindir}/resolveip
|
||||
%attr(755, root, root) %{_bindir}/safe_mysqld
|
||||
|
||||
%attr(755, root, root) %{_sbindir}/mysqld
|
||||
%attr(755, root, root) %{_sbindir}/mysqld-debug
|
||||
|
|
Loading…
Add table
Reference in a new issue