diff options
| author | MySQL Build Team <build@mysql.com> | 2009-11-17 17:19:00 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-11-17 17:19:00 +0100 |
| commit | 1da38990cb81e693c24bc8d06a8bf95abb482bcf (patch) | |
| tree | 4388e8ff0529dfa754788e1b236cb316769c86ce | |
| parent | 8ff142999d009f7602ae58b6559f05e648bd83f3 (diff) | |
| download | mariadb-git-1da38990cb81e693c24bc8d06a8bf95abb482bcf.tar.gz | |
Change the control structures which the RPM spec file uses to govern
the inclusion of a separate malloc library (used for Google's "tcmalloc")
to follow the pattern used for other optional parts.
This is still experimental, there are some "rpmbuild" issues around this.
| -rw-r--r-- | support-files/mysql.spec.sh | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 239611c0b53..6e68e5ee702 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -43,6 +43,12 @@ %{?_with_cluster:%define CLUSTER_BUILD 1} %{!?_with_cluster:%define CLUSTER_BUILD 0} +# ---------------------------------------------------------------------- +# support optional "tcmalloc" stuff (experimental) +# ---------------------------------------------------------------------- +%{?malloc_lib_target:%define WITH_TCMALLOC 1} +%{!?malloc_lib_target:%define WITH_TCMALLOC 0} + %if %{STATIC_BUILD} %define release 0 %else @@ -448,7 +454,7 @@ $MBD/libtool --mode=execute install -m 755 \ $RPM_BUILD_DIR/mysql-%{mysql_version}/mysql-debug-%{mysql_version}/sql/mysqld \ $RBR%{_sbindir}/mysqld-debug -%if %{?malloc_lib_target:1}%{!?malloc_lib_target:0} +%if %{WITH_TCMALLOC} # Even though this is a shared library, put it under /usr/lib/mysql, so it # doesn't conflict with possible shared lib by the same name in /usr/lib. See # `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used. @@ -714,7 +720,7 @@ fi %attr(755, root, root) %{_libdir}/mysql/plugin/ha_innodb_plugin.so* %endif -%if %{?malloc_lib_target:1}%{!?malloc_lib_target:0} +%if %{WITH_TCMALLOC} %attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target} %endif @@ -878,6 +884,10 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com> + +- Fix some problems with the directives around "tcmalloc" (experimental). + * Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com> - "mysqlmanager" got removed from version 5.4, all references deleted. |