diff options
| author | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
| commit | 07302c60078b21b90d00b80677beced5de521f10 (patch) | |
| tree | d7f97f7f906b9107f2569658a74eb1ae2f1eea72 /support-files | |
| parent | af66d20c8eed478ea0a81ba38fea07152823a9d0 (diff) | |
| parent | b5ca723613666bc6472de8d02e50fee7ea7785ef (diff) | |
| download | mariadb-git-07302c60078b21b90d00b80677beced5de521f10.tar.gz | |
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
Diffstat (limited to 'support-files')
| -rw-r--r-- | support-files/mysql.spec.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 3a0dca94267..3e765affa4b 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -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" |