HAYASHI Kentaro
null+****@clear*****
Fri Dec 6 21:48:35 JST 2013
HAYASHI Kentaro 2013-12-06 21:48:35 +0900 (Fri, 06 Dec 2013) New Revision: 35498ccd100f4b36c76ebc00a38d33e3b75c7f93 https://github.com/mroonga/mroonga/commit/35498ccd100f4b36c76ebc00a38d33e3b75c7f93 Message: rpm: apply --with-libmysqlservices-compat option for non bundled case TODO: keep this way or throw away, that's the problem. Modified files: packages/yum/build-rpm.sh Modified: packages/yum/build-rpm.sh (+6 -1) =================================================================== --- packages/yum/build-rpm.sh 2013-12-06 16:19:12 +0900 (f3990aa) +++ packages/yum/build-rpm.sh 2013-12-06 21:48:35 +0900 (bad8c3d) @@ -11,6 +11,7 @@ USE_RPMFORGE=$(cat /tmp/build-use-rpmforge) USE_ATRPMS=$(cat /tmp/build-use-atrpms) BUILD_OPTIONS=$(cat /tmp/build-options) BUILD_SCRIPT=/tmp/build-${PACKAGE}.sh +USE_MYSQLSERVICES_COMPAT=no run() { @@ -103,6 +104,7 @@ case $distribution in 5.*) if [ $PACKAGE = "mysql55-mroonga" ]; then run yum remove MySQL-devel -y + USE_MYSQLSERVICES_COMPAT=yes else run yum remove mysql55-* -y fi @@ -111,6 +113,7 @@ case $distribution in DEPENDED_PACKAGES="$DEPENDED_PACKAGES mysql-devel" DEPENDED_PACKAGES="$DEPENDED_PACKAGES perl-Time-HiRes" rpmbuild_options="$rpmbuild_options --define 'use_system_mysql 1'" + USE_MYSQLSERVICES_COMPAT=yes ;; esac ;; @@ -123,7 +126,9 @@ run yum clean ${yum_options} packages # for debug # rpmbuild_options="$rpmbuild_options --define 'optflags -O0 -ggdb3'" -rpmbuild_options="$rpmbuild_options --define 'mroonga_configure_options --with-libmysqlservices-compat'" +if [ "${USE_MYSQLSERVICES_COMPAT}" = "yes" ]; then + rpmbuild_options="$rpmbuild_options --define 'mroonga_configure_options --with-libmysqlservices-compat'" +fi cat <<EOF > $BUILD_SCRIPT #!/bin/sh -------------- next part -------------- HTML����������������������������...下載
