mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Merge
VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/mysqldemb/mysqldemb.vcproj: Auto merged VC++Files/mysys/mysys.vcproj: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/storage/bdb/bdb.vcproj: Auto merged VC++Files/storage/innobase/innobase.vcproj: Auto merged config/ac-macros/yassl.m4: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged sql/item.cc: Auto merged
This commit is contained in:
@ -1,3 +1,4 @@
|
||||
|
||||
%define mysql_version @VERSION@
|
||||
|
||||
# use "rpmbuild --with static" or "rpm --define '_with_static 1'" (for RPM 3.x)
|
||||
@ -217,6 +218,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
||||
CXX=\"${CXX:-$MYSQL_BUILD_CXX}\" \
|
||||
CFLAGS=\"$CFLAGS\" \
|
||||
CXXFLAGS=\"$CXXFLAGS\" \
|
||||
LDFLAGS=\"$MYSQL_BUILD_LDFLAGS\" \
|
||||
./configure \
|
||||
$* \
|
||||
--with-mysqld-ldflags='-static' \
|
||||
@ -709,6 +711,10 @@ fi
|
||||
# itself - note that they must be ordered by date (important when
|
||||
# merging BK trees)
|
||||
%changelog
|
||||
* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
|
||||
|
||||
- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
|
||||
|
||||
* Wed Mar 07 2006 Kent Boortz <kent@mysql.com>
|
||||
|
||||
- Changed product name from "Community Edition" to "Community Server"
|
||||
|
Reference in New Issue
Block a user