diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-10 09:10:42 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2016-02-10 09:11:42 +0000 |
| commit | f5c514ff5c64e6c2f532a2626b0c7237743d70af (patch) | |
| tree | 7e7769e6dd917e99b1a8462707f8b59d918b4022 | |
| parent | 82f98d3450b94406d57ec96f85e728d3c81f20af (diff) | |
| download | aports-f5c514ff5c64e6c2f532a2626b0c7237743d70af.tar.bz2 aports-f5c514ff5c64e6c2f532a2626b0c7237743d70af.tar.xz | |
main/mariadb: rebase installdb patch. Fixes #5101
| -rw-r--r-- | main/mariadb/APKBUILD | 6 | ||||
| -rw-r--r-- | main/mariadb/fix-mysql-install-db-path.patch | 33 |
2 files changed, 38 insertions, 1 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 29e75ecdef..6b3b0ff244 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb pkgver=10.1.11 -pkgrel=0 +pkgrel=1 pkgdesc="A fast SQL database server" url="http://www.mariadb.org" pkgusers="mysql" @@ -19,6 +19,7 @@ install="$pkgname.pre-install" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz $pkgname.initd musl-fix-inttype.patch + fix-mysql-install-db-path.patch 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch " @@ -180,12 +181,15 @@ _compat_bench() { _compat mysql-bench mariadb-client; } md5sums="c199608ae4282f16007dc8c270ff2439 mariadb-10.1.11.tar.gz 2cf887d864e05947f5b831bd7ca06b74 mariadb.initd 14adb188bde2359d94a5d661ab793cee musl-fix-inttype.patch +b233fb7015a9659f5b825cd8010d2b52 fix-mysql-install-db-path.patch b32eed97ab575140685eeae4a56205a2 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch" sha256sums="cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce mariadb-10.1.11.tar.gz 49bab0ec69432d5c56c53ff83488bfa5eb2859bc95a12e8fc7f12d1f0403f0c6 mariadb.initd 2a66efddb9c5e8076da3d9c602bbfb9413917ab4b5d1015459f550da8ac10c87 musl-fix-inttype.patch +0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904 fix-mysql-install-db-path.patch 2253fa4b0470d4bcfb183967f7658f04867a31b3ce1ffbe22926a52bf595c616 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch" sha512sums="5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b mariadb-10.1.11.tar.gz 53d28d688fc9b45684f8368971c01424e5388d39dfaad8b2c432c54d5fabadf2388786303e92c5ca734cb95b4618863c23f7be2a618efc97854536c3a9dc1240 mariadb.initd 17ee255222ec9d7601554e607586ac1d0a0b818a4547e30a2739e7163df0439357b011f6848fbff4d28e93830256165a29ce8b20f25256d493d4605f253061ef musl-fix-inttype.patch +f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch ff1390b4718cfa6cd02947a82a404ea51483678a5cb52651c3b9d243dbc17c3b37df1013aeab618fa1077f930e75ac104168d7853880b0e2e95a32a9bcd5a2f2 0001-Fix-segfault-with-musl-libc-due-to-bad-use-of-strerr.patch" diff --git a/main/mariadb/fix-mysql-install-db-path.patch b/main/mariadb/fix-mysql-install-db-path.patch new file mode 100644 index 0000000000..f1409aba74 --- /dev/null +++ b/main/mariadb/fix-mysql-install-db-path.patch @@ -0,0 +1,33 @@ +--- a/scripts/CMakeLists.txt ++++ b/scripts/CMakeLists.txt +@@ -175,23 +175,13 @@ + # i.e. makes access relative the current directory. This matches + # the documentation, so better not change this. + +-IF(INSTALL_LAYOUT MATCHES "STANDALONE") +- SET(prefix ".") +- SET(bindir ${prefix}/${INSTALL_BINDIR}) +- SET(sbindir ${prefix}/${INSTALL_SBINDIR}) +- SET(scriptdir ${prefix}/${INSTALL_BINDIR}) +- SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) +- SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) +- SET(localstatedir ${prefix}/data) +-ELSE() +- SET(prefix "${CMAKE_INSTALL_PREFIX}") +- SET(bindir ${INSTALL_BINDIRABS}) +- SET(sbindir ${INSTALL_SBINDIRABS}) +- SET(scriptdir ${INSTALL_BINDIRABS}) +- SET(libexecdir ${INSTALL_SBINDIRABS}) +- SET(pkgdatadir ${INSTALL_MYSQLSHAREDIRABS}) +- SET(localstatedir ${MYSQL_DATADIR}) +-ENDIF() ++SET(prefix "${CMAKE_INSTALL_PREFIX}") ++SET(bindir ${prefix}/${INSTALL_BINDIR}) ++SET(sbindir ${prefix}/${INSTALL_SBINDIR}) ++SET(scriptdir ${prefix}/${INSTALL_BINDIR}) ++SET(libexecdir ${prefix}/${INSTALL_SBINDIR}) ++SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR}) ++SET(localstatedir ${MYSQL_DATADIR}) + + IF(UNIX) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh |