Kentaro Hayashi 2019-05-29 14:03:15 +0900 (Wed, 29 May 2019) Revision: e0efa1d0f686777ae4e328757720840b06166177 https://github.com/mroonga/mroonga/commit/e0efa1d0f686777ae4e328757720840b06166177 Message: packages yum: setup MySQL8 build environment correctly Modified files: packages/yum/build-rpm.sh Modified: packages/yum/build-rpm.sh (+10 -6) =================================================================== --- packages/yum/build-rpm.sh 2019-05-29 14:02:19 +0900 (6c9c94e6) +++ packages/yum/build-rpm.sh 2019-05-29 14:03:15 +0900 (9d8f4d29) @@ -82,7 +82,7 @@ case ${distribution} in run yum makecache case ${package_name} in - mysql5?-community-${PACKAGE}|mysql80-community-${PACKAGE}) + mysql5?-community-${PACKAGE}) release_rpm=mysql-community-release-el${distribution_version}-7.noarch.rpm run yum -y install http://repo.mysql.com/${release_rpm} if [ "${package_name}" = "mysql57-community-${PACKAGE}" ]; then @@ -93,11 +93,15 @@ case ${distribution} in run yum install -y cmake28 fi fi - if [ "${package_name}" = "mysql80-community-${PACKAGE}" ]; then - run yum install -y centos-release-scl yum-utils - run yum-config-manager --enable rhel-server-rhscl-7-rpms - run yum install -y cmake3 devtoolset-8-gcc devtoolset-8-gcc-c++ - fi + run yum install -y mysql-community-devel + ;; + mysql80-community-${PACKAGE}) + release_rpm=mysql80-community-release-el${distribution_version}.rpm + run yum -y install http://repo.mysql.com/${release_rpm} + run yum install -y centos-release-scl yum-utils autoconf-archive + run yum-config-manager --enable rhel-server-rhscl-7-rpms + run yum install -y cmake3 devtoolset-8-gcc devtoolset-8-gcc-c++ + run source /opt/rh/devtoolset-8/enable run yum install -y mysql-community-devel ;; mariadb-${PACKAGE}) -------------- next part -------------- An HTML attachment was scrubbed... URL: <https://lists.osdn.me/mailman/archives/groonga-mysql-commit/attachments/20190529/81588278/attachment.html>
