diff options
| author | unknown <lenz@mysql.com> | 2003-06-04 22:31:06 +0200 |
|---|---|---|
| committer | unknown <lenz@mysql.com> | 2003-06-04 22:31:06 +0200 |
| commit | bd49ae5f740f67998aa2b8d4e6738bed5bd6bd1f (patch) | |
| tree | 3ce67c2842595b4a87afd99558ecb40c334465ac /support-files | |
| parent | 487bf48ad6a90ec9dad6a4ab4e89c6159ddc2860 (diff) | |
| download | mariadb-git-bd49ae5f740f67998aa2b8d4e6738bed5bd6bd1f.tar.gz | |
- When compiling the Max package incl. RAID support using gcc, make sure
to set CXX=gcc (cannot link the code with g++) - this should help to
recompile the RPM on Distributions using gcc 3
- Added a symlink /usr/sbin/rcmysql -> /etc/init.d/mysql
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index aab3e298e14..06ba2d63f45 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -254,6 +254,13 @@ export PATH # Build the 4.0 Max binary (includes BDB and UDFs and therefore # cannot be linked statically against the patched glibc) +# If we want to compile with RAID using gcc 3, we need to use +# gcc instead of g++ to avoid linking problems (RAID code is written in C++) +if gcc -v 2>&1 | grep 'version 3' > /dev/null 2>&1 +then + export CXX="gcc" +fi + BuildMySQL "--enable-shared \ --with-berkeley-db \ --with-innodb \ @@ -318,6 +325,10 @@ install -m644 $MBD/sql/mysqld.sym $RBR/usr/lib/mysql/mysqld.sym install -m644 $MBD/support-files/mysql-log-rotate $RBR/etc/logrotate.d/mysql install -m755 $MBD/support-files/mysql.server $RBR/etc/init.d/mysql +# Create a symlink "rcmysql", pointing to the init.script. SuSE users +# will appreciate that, as all services usually offer this. +ln -s ../../sbin/init.d/mysql $RPM_BUILD_ROOT/usr/sbin/rcmysql + # Create symbolic compatibility link safe_mysqld -> mysqld_safe # (safe_mysqld will be gone in MySQL 4.1) ln -sf ./mysqld_safe $RBR/usr/bin/safe_mysqld @@ -462,6 +473,7 @@ fi %attr(755, root, root) /usr/bin/safe_mysqld %attr(755, root, root) /usr/sbin/mysqld +%attr(755, root, root) /usr/sbin/rcmysql %attr(644, root, root) /usr/lib/mysql/mysqld.sym %attr(644, root, root) /etc/logrotate.d/mysql |