diff options
author | 2018-04-22 13:37:52 -0600 | |
---|---|---|
committer | 2018-04-22 13:37:52 -0600 | |
commit | da66fd1526e1fe9c52ae48ef323b98332f4a559a (patch) | |
tree | b0ad7eeaf4879ea192662a2ea6a6b747ee5cead3 | |
parent | Add fix for mysql-5.7 series (diff) | |
download | vmacs-da66fd1526e1fe9c52ae48ef323b98332f4a559a.tar.gz vmacs-da66fd1526e1fe9c52ae48ef323b98332f4a559a.tar.bz2 vmacs-da66fd1526e1fe9c52ae48ef323b98332f4a559a.zip |
Removing support for mysql-5.7, requires outdated "boost"
-rw-r--r-- | dev-db/mysql/Manifest | 2 | ||||
-rw-r--r-- | dev-db/mysql/files/my.cnf-5.7 | 3 | ||||
-rw-r--r-- | dev-db/mysql/mysql-5.7.22.ebuild | 178 |
3 files changed, 0 insertions, 183 deletions
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index b3d8785..cb2a977 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -2,8 +2,6 @@ AUX my.cnf-5.7 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e AUX my.cnf-8.0 138 BLAKE2B 71862b4b77334ab74002237453d2c7f6b51cd1ae57dba3b00b19e216d3f10034796de9aa618efb11482cef78b7c7e50393b5f665810d03321b5ca770ac8a6144 SHA512 1d7250689005c948f4a849959baf33f5f0fda099f230611651919ed053fb563daa19d996b7ca6714e224174172fb504f4d7d08e9d449a7e1203e32cf3fdec782 AUX my.cnf.distro-client 631 BLAKE2B 9ba4edf4398410ef40bf7312a485edd70a807a9da37c69bb6f6bee2c58a722fef1b9f37d28f09f41912722451cc0e9913218d15be472a853a942119f019bf486 SHA512 f40539a56afe79b7c0dff14de46690fd67e8350755b27fbb490d914001c01836cdf9f851aa461bd8b60943ef2ca084b70e48d995f5c18bcc241309f3473c610c AUX my.cnf.distro-server 994 BLAKE2B 41dceff58edf748f9f60ac3c0d1682d2fc2f026fc1fd14b4c2dea398814beda3c09aabea04dd3a9e145464524c629e7e69dc257d1245e0a46dd8584b7f685172 SHA512 cf172edc23d3dda49c21af6b8adef8aa13694d8ceecddf1d612d4ae34d00ba53c51ae4ae7ca4d11083eeacb5d862f59a855a9d80e9e448ab8bbf17f42aac2650 -DIST mysql-5.7.22.tar.gz 51868499 BLAKE2B f5164a9712b57ab6fcadd62302a36f1c53281516065f4d3ceefe61f49831be4f4dc9567a1d4d20b20423d3a18f1158dba8d14e36e7c73c8ffa55dc75be20a3f0 SHA512 91df104493edac6a7b7e76ab1c8d465a6a5cba7552d2d0e2e0f58e3943a5ccdbcad9964f30c81d5d734d0dc988ef07f90215e91639014e51c8fba773855123d7 DIST mysql-8.0.11.tar.gz 79361578 BLAKE2B 6ae94579054a831616afd934a88350ae8790e76e0219541962bc98ed0ac7cea8fa30f581ff2188106a4ade50fa8a130e37121dda736fc49b5fa7525fdb502950 SHA512 6bf8496f9a3de0687d31d5c98bc2483a22510e95439a2278ea4f80de76e38db4c3d7c9367c9119f39027abaf2e22106ff92d59df0475e142ea79ab48e9c02610 DIST mysql-extras-20180214-0024Z.tar.bz2 316686 BLAKE2B a893e2975a8062ab236f642d158a7833656942adb31d467b784a9224e7dd87872c3784bb29e93b620a58cd9a835d65248f1a817cdbafa574b5949e2b4262108a SHA512 ad0e81695a70954ad107fe104f9140be24e53d499aed6c123e68e1a062ec5cc90c70f6272fdc014e567794e331301e656ba01b22c2c7a1afaf11e14a9190fb0b -EBUILD mysql-5.7.22.ebuild 5836 BLAKE2B dab945656587000599eb776f59a3ea7b31d17bf81534c9aff6ae8af1d0e1dc4690bb770251d484164884b2a26b803d3120cd44aafe6a3846bb36a0d70db050da SHA512 7e5647a71eb9d723a3f4aad536b60d038dbb080beac8fc783aa0a43533266bb49dfbe475c0d95aea8ae3bad5733cec8261ce62f6ea5046ef2e953c9f1d8dee6a EBUILD mysql-8.0.11.ebuild 5859 BLAKE2B 2f052fd186c5a48abc6f84a140e332afe89add08a03d1ecc29b1d272d69756794ac6a0994df2b41b041ecd21e534beb91aeeb51ae02dcbfd96fe37cfea27607b SHA512 fa2798dac76efb17d0827f6e64332857c906edbb56b10738973713ae061fa706d81fb80b2dbf3620ddbfdc09b0f1e686c6f84f873e69cdd5bc1b0d4bc887e0e9 diff --git a/dev-db/mysql/files/my.cnf-5.7 b/dev-db/mysql/files/my.cnf-5.7 deleted file mode 100644 index 571ebf0..0000000 --- a/dev-db/mysql/files/my.cnf-5.7 +++ /dev/null @@ -1,3 +0,0 @@ -# @GENTOO_PORTAGE_EPREFIX@/etc/mysql/my.cnf: The global mysql configuration file. - -!includedir @GENTOO_PORTAGE_EPREFIX@/etc/mysql/mysql.d diff --git a/dev-db/mysql/mysql-5.7.22.ebuild b/dev-db/mysql/mysql-5.7.22.ebuild deleted file mode 100644 index 06e3e32..0000000 --- a/dev-db/mysql/mysql-5.7.22.ebuild +++ /dev/null @@ -1,178 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_EXTRAS_VER="20180214-0024Z" -MY_PV="${PV//_alpha_pre/-m}" -MY_PV="${MY_PV//_/-}" -HAS_TOOLS_PATCH="0" -SUBSLOT="18" -#fails to build with ninja -CMAKE_MAKEFILE_GENERATOR=emake - -inherit mysql-multilib-r1 -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE numa" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -COMMON_DEPEND="numa? ( sys-process/numactl:= )" - -DEPEND="${COMMON_DEPEND} - || ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - test? ( dev-perl/JSON )" -RDEPEND="${COMMON_DEPEND}" - -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt - -src_prepare() { - mysql-multilib-r1_src_prepare - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi -} - -src_configure() { - # validate_password plugin uses exceptions when it shouldn't yet (until 5.7) - # disable until we see what happens with it - local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 -DWITH_NUMA=$(usex numa ON OFF) ) - mysql-multilib-r1_src_configure -} - -# Official test instructions: -# USE='server extraengine perl openssl static-libs' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mysql-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if use server ; then - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # create symlink for the tests to find mysql_tzinfo_to_sql - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" - - # These are failing in MySQL 5.5/5.6 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # funcs_1.is_triggers funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, - # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, - # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql - # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test: - # segfaults at random under Portage only, suspect resource limits. - # - # rpl.rpl_plugin_load - # fails due to included file not listed in expected result - # appears to be poor planning - # - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - # - # main.events_2 - # Fails on date in past without preserve causing the drop to fail - - for t in \ - binlog.binlog_mysqlbinlog_filter \ - binlog.binlog_statement_insert_delayed \ - funcs_1.is_columns_mysql \ - funcs_1.is_tables_mysql \ - funcs_1.is_triggers \ - main.information_schema \ - main.mysql_client_test \ - main.mysqld--help-notwin \ - perfschema.binlog_edge_mix \ - perfschema.binlog_edge_stmt \ - rpl.rpl_plugin_load \ - main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ - main.events_2 \ - ; do - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" - done - - if ! use extraengine ; then - # bug 401673, 530766 - for t in federated.federated_plugin ; do - mysql-multilib-r1_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" - done - fi - - for t in main.mysql main.mysql_upgrade ; do - mysql-multilib-r1_disable_test "$t" "Test $t broken upstream - error return value not updated" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # Set file limits higher so tests run - ulimit -n 3000 - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --suite-timeout=5000 --reorder - retstatus_tests=$? -# [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" -# has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" -# has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - einfo "Skipping server tests due to minimal build." - fi -} |