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

- added the MYSQL_EXTRA_LDFLAGS to the mysql_tzinfo_to_sql link

Browse Source 
flags to enable static linking (to avoid having a shared lib
   dependency in the Linux RPMs)
 - Disabled OpenSSL in the Max RPM
This commit is contained in:
lenz@mysql.com
2004-07-30 13:52:44 +02:00
parent 3262c28710
commit 453a079feb
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/Makefile.am
View File

@ -96,7 +96,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_SOURCES = gen_lex_hash.cc
gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS)
mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc mysql_tzinfo_to_sql_SOURCES = mysql_tzinfo_to_sql.cc
mysql_tzinfo_to_sql_LDADD = $(LDADD) $(CXXLDFLAGS) mysql_tzinfo_to_sql_LDADD = @MYSQLD_EXTRA_LDFLAGS@ $(LDADD) $(CXXLDFLAGS)
DEFS = -DMYSQL_SERVER \ DEFS = -DMYSQL_SERVER \
-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \

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

@ -149,7 +149,7 @@ languages and applications need to dynamically load and use MySQL.
%package Max %package Max
Release: %{release} Release: %{release}
Summary: MySQL - server with Berkeley DB, OpenSSL, RAID and UDF support Summary: MySQL - server with Berkeley DB, RAID and UDF support
Group: Applications/Databases Group: Applications/Databases
Provides: mysql-Max Provides: mysql-Max
Obsoletes: mysql-Max Obsoletes: mysql-Max
@ -157,7 +157,7 @@ Requires: MySQL >= 4.0
%description Max %description Max
Optional MySQL server binary that supports additional features like Optional MySQL server binary that supports additional features like
Berkeley DB, OpenSSL, RAID and User Defined Functions (UDFs). Berkeley DB, RAID and User Defined Functions (UDFs).
To activate this binary, just install this package in addition to To activate this binary, just install this package in addition to
the standard MySQL package. the standard MySQL package.
@ -269,7 +269,7 @@ then
fi fi
BuildMySQL "--enable-shared \ BuildMySQL "--enable-shared \
--with-openssl \ --without-openssl \
--with-berkeley-db \ --with-berkeley-db \
--with-innodb \ --with-innodb \
--with-raid \ --with-raid \
@ -579,6 +579,11 @@ fi
# The spec file changelog only includes changes made to the spec file # The spec file changelog only includes changes made to the spec file
# itself # itself
%changelog %changelog
* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
- disabled OpenSSL in the Max binaries again (the RPM packages were the
only exception to this anyway) (BUG 1043)
* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com> * Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
- fixed server postinstall (mysql_install_db was called with the wrong - fixed server postinstall (mysql_install_db was called with the wrong