mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Add conditionals for bundled zlib and innodb plugin
This commit is contained in:
@ -31,6 +31,20 @@
|
|||||||
%{?_with_yassl:%define YASSL_BUILD 1}
|
%{?_with_yassl:%define YASSL_BUILD 1}
|
||||||
%{!?_with_yassl:%define YASSL_BUILD 0}
|
%{!?_with_yassl:%define YASSL_BUILD 0}
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
# use "rpmbuild --with bundled_zlib" or "rpm --define '_with_bundled_zlib 1'"
|
||||||
|
# (for RPM 3.x) to build using the bundled zlib (off by default)
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
%{?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 1}
|
||||||
|
%{!?_with_bundled_zlib:%define WITH_BUNDLED_ZLIB 0}
|
||||||
|
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
# use "rpmbuild --without innodb_plugin" or "rpm --define '_without_innodb_plugin 1'"
|
||||||
|
# (for RPM 3.x) to not build the innodb plugin (on by default with innodb builds)
|
||||||
|
# ----------------------------------------------------------------------
|
||||||
|
%{?_without_innodb_plugin:%define WITHOUT_INNODB_PLUGIN 1}
|
||||||
|
%{!?_without_innodb_plugin:%define WITHOUT_INNODB_PLUGIN 0}
|
||||||
|
|
||||||
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
|
# use "rpmbuild --with cluster" or "rpm --define '_with_cluster 1'" (for RPM 3.x)
|
||||||
# to build with cluster support (off by default)
|
# to build with cluster support (off by default)
|
||||||
%{?_with_cluster:%define CLUSTER_BUILD 1}
|
%{?_with_cluster:%define CLUSTER_BUILD 1}
|
||||||
@ -292,6 +306,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||||||
--enable-thread-safe-client \
|
--enable-thread-safe-client \
|
||||||
--with-readline \
|
--with-readline \
|
||||||
--with-innodb \
|
--with-innodb \
|
||||||
|
%if %{WITHOUT_INNODB_PLUGIN}
|
||||||
|
--without-plugin-innodb_plugin \
|
||||||
|
%endif
|
||||||
%if %{CLUSTER_BUILD}
|
%if %{CLUSTER_BUILD}
|
||||||
--with-ndbcluster \
|
--with-ndbcluster \
|
||||||
%else
|
%else
|
||||||
@ -305,6 +322,9 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-$PATH}\" \
|
|||||||
--without-plugin-example \
|
--without-plugin-example \
|
||||||
--with-partition \
|
--with-partition \
|
||||||
--with-big-tables \
|
--with-big-tables \
|
||||||
|
%if %{WITH_BUNDLED_ZLIB}
|
||||||
|
--with-zlib-dir=bundled \
|
||||||
|
%endif
|
||||||
--enable-shared \
|
--enable-shared \
|
||||||
"
|
"
|
||||||
make
|
make
|
||||||
@ -853,6 +873,10 @@ fi
|
|||||||
# itself - note that they must be ordered by date (important when
|
# itself - note that they must be ordered by date (important when
|
||||||
# merging BK trees)
|
# merging BK trees)
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
|
||||||
|
|
||||||
|
- Add conditionals for bundled zlib and innodb plugin
|
||||||
|
|
||||||
* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
|
* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
|
||||||
|
|
||||||
- Install plugin libraries in appropriate packages.
|
- Install plugin libraries in appropriate packages.
|
||||||
|
Reference in New Issue
Block a user