From 403072ebeb13b08367b83a2555b7db773c95f183 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 26 Mar 2018 12:07:10 +0000 Subject: main/mariadb-connector-c: fix ucontext header check --- main/mariadb-connector-c/APKBUILD | 9 ++++++--- main/mariadb-connector-c/fix-ucontext-header.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 main/mariadb-connector-c/fix-ucontext-header.patch diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD index dee7b44c00..b541bbf7eb 100644 --- a/main/mariadb-connector-c/APKBUILD +++ b/main/mariadb-connector-c/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=mariadb-connector-c pkgver=3.0.3 -pkgrel=0 +pkgrel=1 pkgdesc="The MariaDB Native Client library (C driver)" url="http://mariadb.org/" arch="all" @@ -11,7 +11,9 @@ makedepends="$depends_dev cmake" replaces="mariadb-client-libs" subpackages="$pkgname-dev" source="https://downloads.mariadb.org/interstitial/connector-c-3.0.3/mariadb-connector-c-$pkgver-src.tar.gz - cmake.patch" + cmake.patch + fix-ucontext-header.patch + " builddir="$srcdir/mariadb-connector-c-$pkgver-src" build() { @@ -57,4 +59,5 @@ dev() { } sha512sums="6da66a32165cb74b106bf94e13a35d4bb38f05e5d2b3ff3740862dfc0892a7705977c1394b4f84b8e1f1e50a59a3fadbc62e7733b1feb532c6368a9fc262db04 mariadb-connector-c-3.0.3-src.tar.gz -4fef45afaa2135310654e31df09de6a451014bdd495b9aa08467b666f543a643c1efdbcca4e866120a357e26a228765f511e8420327708775148b120ec9f161c cmake.patch" +4fef45afaa2135310654e31df09de6a451014bdd495b9aa08467b666f543a643c1efdbcca4e866120a357e26a228765f511e8420327708775148b120ec9f161c cmake.patch +ad52cccb5517d11838bf16aee5aff63d87075e9ef5787e726d8bfea2854d3e2b5fa7aa94c0e93b1f7e7e21f48d21b1b6fcdd161fadb9999dcc7a3a5b8e12d883 fix-ucontext-header.patch" diff --git a/main/mariadb-connector-c/fix-ucontext-header.patch b/main/mariadb-connector-c/fix-ucontext-header.patch new file mode 100644 index 0000000000..219813fdfe --- /dev/null +++ b/main/mariadb-connector-c/fix-ucontext-header.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/CheckIncludeFiles.cmake b/cmake/CheckIncludeFiles.cmake +index 89b40ad..cc258ba 100644 +--- a/cmake/CheckIncludeFiles.cmake ++++ b/cmake/CheckIncludeFiles.cmake +@@ -73,4 +73,7 @@ CHECK_INCLUDE_FILES (termio.h HAVE_TERMIO_H) + CHECK_INCLUDE_FILES (termios.h HAVE_TERMIOS_H) + CHECK_INCLUDE_FILES (unistd.h HAVE_UNISTD_H) + CHECK_INCLUDE_FILES (utime.h HAVE_UTIME_H) +-CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_H) ++CHECK_INCLUDE_FILES (ucontext.h HAVE_UCONTEXT_HEADER) ++IF(HAVE_UCONTEXT_HEADER) ++ CHECK_FUNCTION_EXISTS(makecontext HAVE_UCONTEXT_H) ++ENDIF(HAVE_UCONTEXT_HEADER) -- cgit v1.2.3