diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-08-24 21:21:48 -0300 |
|---|---|---|
| committer | Kevin Daudt <kdaudt@alpinelinux.org> | 2019-09-25 21:18:40 +0000 |
| commit | aa9c56516cc30d4c3ed568d35b62ab53d78a8b7f (patch) | |
| tree | 8658aab6c9042bd5799fbff1a69c76710e102f3a | |
| parent | f3a95c4237ca9959000d7a1b76f3fedebf4cd363 (diff) | |
| download | aports-aa9c56516cc30d4c3ed568d35b62ab53d78a8b7f.tar.bz2 aports-aa9c56516cc30d4c3ed568d35b62ab53d78a8b7f.tar.xz | |
main/mariadb-connector-c: upgrade to 3.1.3
Closes GH-10423
| -rw-r--r-- | main/mariadb-connector-c/APKBUILD | 9 | ||||
| -rw-r--r-- | main/mariadb-connector-c/cmake.patch | 13 |
2 files changed, 3 insertions, 19 deletions
diff --git a/main/mariadb-connector-c/APKBUILD b/main/mariadb-connector-c/APKBUILD index 05d05e9f4a..daf7e7dcf1 100644 --- a/main/mariadb-connector-c/APKBUILD +++ b/main/mariadb-connector-c/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mariadb-connector-c -pkgver=3.1.2 +pkgver=3.1.3 pkgrel=0 pkgdesc="The MariaDB Native Client library (C driver)" url="https://mariadb.org/" @@ -11,7 +11,6 @@ makedepends="$depends_dev cmake" replaces="mariadb-client-libs" subpackages="$pkgname-dev" source="https://downloads.mariadb.org/interstitial/connector-c-$pkgver/mariadb-connector-c-$pkgver-src.tar.gz - cmake.patch fix-ucontext-header.patch " builddir="$srcdir/mariadb-connector-c-$pkgver-src" @@ -26,7 +25,6 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ -DINSTALL_LIBDIR=/usr/lib \ -DINSTALL_INCLUDEDIR=/usr/include/mysql \ @@ -36,7 +34,7 @@ build() { -DWITH_EXTERNAL_ZLIB=YES \ -DWITH_MYSQLCOMPAT=ON \ -DWITH_SSL=OPENSSL \ - ${CMAKE_CROSSOPTS} + $CMAKE_CROSSOPTS make } @@ -58,6 +56,5 @@ dev() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="8ad0ec5aea07a04e7ac9da6af3d067755dd8f22deed071de2321c581374b5ed1e4d6bab048b231655d3c2a3722b2b99f276d95046c659f867cbd58d772fb17bb mariadb-connector-c-3.1.2-src.tar.gz -027a9d383ce27a527b77ac06b9505709cad8fe0173455863590f502996966300fedea87687630113d74e5b9be5349217b18206c2dbb89f7064129cb5417e44cf cmake.patch +sha512sums="ca3809a5f1a33317962908ee40d5c339ba6b02c5c8818bf12af9b78eb2289efad711ab74ac7706d711951b22957ba897b5e80b60e8df44924ca70569a4e1c5e7 mariadb-connector-c-3.1.3-src.tar.gz 757a2d3531ee271cf5473671bf4d0ac07dc8eb94ab4b6ede848ba7a55415a77f90e7275103be91c73e343e94cdbf2cd652eb6cef6ed48917991733d60d3b8777 fix-ucontext-header.patch" diff --git a/main/mariadb-connector-c/cmake.patch b/main/mariadb-connector-c/cmake.patch deleted file mode 100644 index f3f6060af6..0000000000 --- a/main/mariadb-connector-c/cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/mariadb_config/mariadb_config.c.in -+++ b/mariadb_config/mariadb_config.c.in -@@ -5,8 +5,8 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" -+#define INCLUDE "-I@INSTALL_INCLUDEDIR@ -I@INSTALL_INCLUDEDIR@" -+#define LIBS "-L@INSTALL_LIBDIR@/ -lmariadb @extra_dynamic_LDFLAGS@" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" |