diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-03-08 21:14:15 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-03-08 21:15:24 +0200 |
| commit | 6e4ec8d55d87327ea4b9900825bd52086cb2f946 (patch) | |
| tree | f136ec67a8479d3f728b1b09497a40e06ce3a944 /main/mariadb | |
| parent | 4beff7053aa1e127de99ee2c84ab7e90154ebdf5 (diff) | |
| download | aports-6e4ec8d55d87327ea4b9900825bd52086cb2f946.tar.bz2 aports-6e4ec8d55d87327ea4b9900825bd52086cb2f946.tar.xz | |
main/mariadb: fix ucontext configure check
musl ships the header for other purposes, but makecontext is not
implemented. fix the check to detect if makecontext is implemented
before enabling code using it.
Diffstat (limited to 'main/mariadb')
| -rw-r--r-- | main/mariadb/APKBUILD | 10 | ||||
| -rw-r--r-- | main/mariadb/fix-ucontext-check.patch | 19 |
2 files changed, 26 insertions, 3 deletions
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD index 4a31095756..e884274612 100644 --- a/main/mariadb/APKBUILD +++ b/main/mariadb/APKBUILD @@ -19,6 +19,7 @@ install="$pkgname.pre-install" source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz $pkgname.initd fix-mysql-install-db-path.patch + fix-ucontext-check.patch " subpackages="$pkgname-doc $pkgname-dev $pkgname-common $pkgname-libs @@ -178,10 +179,13 @@ _compat_bench() { _compat mysql-bench mariadb-client; } md5sums="a2c0809f27ec112139c2c50f03569b2b mariadb-10.1.12.tar.gz 2cf887d864e05947f5b831bd7ca06b74 mariadb.initd -b233fb7015a9659f5b825cd8010d2b52 fix-mysql-install-db-path.patch" +b233fb7015a9659f5b825cd8010d2b52 fix-mysql-install-db-path.patch +96b7247f919bf4e1de13a9d0ce7ef515 fix-ucontext-check.patch" sha256sums="795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 mariadb-10.1.12.tar.gz 49bab0ec69432d5c56c53ff83488bfa5eb2859bc95a12e8fc7f12d1f0403f0c6 mariadb.initd -0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904 fix-mysql-install-db-path.patch" +0f4d97cc9d512fc43cdb4b2f2a6dc16b37cb72a18c7d7a3e23e11a116d119904 fix-mysql-install-db-path.patch +3d9a12bf04fcf215567b6a395fe83fb6528602baf4283d42181bd73f93b5f538 fix-ucontext-check.patch" sha512sums="c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 mariadb-10.1.12.tar.gz 53d28d688fc9b45684f8368971c01424e5388d39dfaad8b2c432c54d5fabadf2388786303e92c5ca734cb95b4618863c23f7be2a618efc97854536c3a9dc1240 mariadb.initd -f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch" +f85e96490de56aa4e6115f931bf256bef4e1b93cadbe4ac947d6abdc03072bf2d0872e0268ae37cd98edf13538ece73e9f8b6efa8133bab23168a825c5066ab1 fix-mysql-install-db-path.patch +82fa93411483f5d1b57d978087a891bcab6a011e45c2d79b08d28718f5717994b423fc81d2170dad2fe65303153ac29655a81ce5039e73e37cebb159392a86cf fix-ucontext-check.patch" diff --git a/main/mariadb/fix-ucontext-check.patch b/main/mariadb/fix-ucontext-check.patch new file mode 100644 index 0000000000..1e1d58ff36 --- /dev/null +++ b/main/mariadb/fix-ucontext-check.patch @@ -0,0 +1,19 @@ +diff -ru mariadb-10.1.12.orig/configure.cmake mariadb-10.1.12/configure.cmake +--- mariadb-10.1.12.orig/configure.cmake 2016-02-24 16:25:21.000000000 +0200 ++++ mariadb-10.1.12/configure.cmake 2016-03-08 21:11:52.767533395 +0200 +@@ -1087,9 +1087,12 @@ + CHECK_STRUCT_HAS_MEMBER("struct dirent" d_ino "dirent.h" STRUCT_DIRENT_HAS_D_INO) + CHECK_STRUCT_HAS_MEMBER("struct dirent" d_namlen "dirent.h" STRUCT_DIRENT_HAS_D_NAMLEN) + SET(SPRINTF_RETURNS_INT 1) +-CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_H) +-IF(NOT HAVE_UCONTEXT_H) +- CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_H) ++CHECK_INCLUDE_FILE(ucontext.h HAVE_UCONTEXT_HEADER) ++IF(NOT HAVE_UCONTEXT_HEADER) ++ CHECK_INCLUDE_FILE(sys/ucontext.h HAVE_UCONTEXT_HEADER) ++ENDIF() ++IF(HAVE_UCONTEXT_HEADER) ++ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) + ENDIF() + + CHECK_STRUCT_HAS_MEMBER("struct timespec" tv_sec "time.h" STRUCT_TIMESPEC_HAS_TV_SEC) |