Browse Source

use our my.cnf explicitely, only build -static, but dynamically link against system libs

master
Michael van Elst 23 years ago committed by Ralf S. Engelschall
parent
commit
d933a53828
  1. 12
      mysql/mysql.spec
  2. 5
      mysql/rc.mysql

12
mysql/mysql.spec

@ -37,7 +37,7 @@ Distribution: OpenPKG [BASE]
Group: Database
License: GPL
Version: %{V_major}.%{V_minor}
Release: 20030103
Release: 20030109
# package options
%option with_berkeleydb yes
@ -90,9 +90,10 @@ AutoReqProv: no
%build
# determine additional configure options
case "%{l_target}" in
*-freebsd* ) opt="--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static" ;;
*-linux* ) opt="--with-client-ldflags=-all-static --with-mysqld-ldflags=-all-static" ;;
*-solaris* ) opt="" ;; # static compiling doesn't work under Solaris because of missing libdl.a
*-freebsd* ) opt="--with-client-ldflags=-static --with-mysqld-ldflags=-static" ;;
*-linux* ) opt="--with-client-ldflags=-static --with-mysqld-ldflags=-static" ;;
*-solaris* ) opt="--with-client-ldflags=-static --with-mysqld-ldflags=-static" ;;
#*-solaris* ) opt="" ;; # static compiling doesn't work under Solaris because of missing libdl.a
esac
# configure source tree
@ -188,7 +189,8 @@ AutoReqProv: no
%post
# create initial database
$RPM_INSTALL_PREFIX/bin/mysql_install_db
$RPM_INSTALL_PREFIX/bin/mysql_install_db \
--defaults-file=$RPM_INSTALL_PREFIX/etc/mysql/my.cnf
chown %{l_rusr}:%{l_rgrp} \
$RPM_INSTALL_PREFIX/etc/mysql/my.cnf \
$RPM_INSTALL_PREFIX/etc/mysql/my.pwd

5
mysql/rc.mysql

@ -6,6 +6,7 @@
%config
mysql_enable="yes"
mysql_pwd_file=@l_prefix@/etc/mysql/my.pwd
mysql_cnf_file=@l_prefix@/etc/mysql/my.cnf
mysql_log_prolog="true"
mysql_log_epilog="true"
mysql_log_numfiles="10"
@ -23,12 +24,14 @@
cd @l_prefix@
@l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
--mysqld=@mysqld@ \
--defaults-file=${mysql_cnf_file} \
--pid-file="$mysql_pid_file" \
--err-log="$mysql_log_err" &
%stop -p 200 -u @l_rusr@
opServiceEnabled mysql || exit 0
@l_prefix@/bin/mysqladmin \
--defaults-file=${mysql_cnf_file} \
--defaults-extra-file=${mysql_pwd_file} \
shutdown
@ -36,6 +39,7 @@
opServiceEnabled mysql || exit 0
cd @l_prefix@
@l_prefix@/bin/mysqladmin \
--defaults-file=${mysql_cnf_file} \
--defaults-extra-file=${mysql_pwd_file} \
shutdown
@l_prefix@/bin/safe_mysqld >/dev/null 2>&1 \
@ -50,6 +54,7 @@
-z${mysql_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \
-P "${mysql_log_prolog}" \
-E "@l_prefix@/bin/mysqladmin \
--defaults-file=${mysql_cnf_file} \
--defaults-extra-file=${mysql_pwd_file} \
flush-logs ; ${mysql_log_epilog}" \
${mysql_log_common} \

Loading…
Cancel
Save