diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-22 12:51:13 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-26 08:54:40 +0000 |
| commit | 86472cf416d488df0ea4c9044accd77ff2c583c8 (patch) | |
| tree | f96511d743e12c2ba064dd3b44b14606a78cf6bd | |
| parent | 75a15096cc405bd8f2b2d4fb7f3d9ae90ecf0bd0 (diff) | |
| download | aports-86472cf416d488df0ea4c9044accd77ff2c583c8.tar.bz2 aports-86472cf416d488df0ea4c9044accd77ff2c583c8.tar.xz | |
main/mariadb-connector-c: move from testing
this is needed for mariadb 10.2 upgrade
also fix include and lib dir and -dev depends
fixes #4768
| -rw-r--r-- | main/mariadb-connector-c/APKBUILD (renamed from testing/mariadb-connector-c/APKBUILD) | 7 | ||||
| -rw-r--r-- | main/mariadb-connector-c/cmake.patch (renamed from testing/mariadb-connector-c/cmake.patch) | 0 |
2 files changed, 4 insertions, 3 deletions
diff --git a/testing/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD index dd71d06458..dee7b44c00 100644 --- a/testing/mariadb-connector-c/APKBUILD +++ b/main/mariadb-connector-c/APKBUILD @@ -6,7 +6,8 @@ pkgdesc="The MariaDB Native Client library (C driver)" url="http://mariadb.org/" arch="all" license="LGPLv2+" -makedepends="cmake libressl-dev zlib-dev" +depends_dev="libressl-dev zlib-dev" +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 @@ -25,8 +26,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DINSTALL_LIBDIR=lib \ - -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_LIBDIR=/usr/lib \ + -DINSTALL_INCLUDEDIR=/usr/include/mysql \ \ -DMARIADB_PORT=3306 \ -DMARIADB_UNIX_ADDR=/var/lib/mysql/mysql.sock \ diff --git a/testing/mariadb-connector-c/cmake.patch b/main/mariadb-connector-c/cmake.patch index 87eee0e0c0..87eee0e0c0 100644 --- a/testing/mariadb-connector-c/cmake.patch +++ b/main/mariadb-connector-c/cmake.patch |