aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTBK <tbk@jjtc.eu>2021-01-06 03:18:08 +0100
committerTBK <tbk@jjtc.eu>2021-01-06 03:39:56 +0100
commit1353db2c9061588594599a94b9f31bffaf6e9f81 (patch)
treee172415046f35f9c8217c8ff068d9becccaa5cd1
parent0969c451e0d9a380e4cf13dc7eac4726b20f0601 (diff)
downloadaports-1353db2c9061588594599a94b9f31bffaf6e9f81.tar.gz
aports-1353db2c9061588594599a94b9f31bffaf6e9f81.tar.bz2
aports-1353db2c9061588594599a94b9f31bffaf6e9f81.tar.xz
testing/mariadb-connector-odbc: upgrade to 3.1.11
- Remove -doc since it only contains the license files. - Cleanup - Patch linking issue. Closes #12142
-rw-r--r--testing/mariadb-connector-odbc/APKBUILD31
-rw-r--r--testing/mariadb-connector-odbc/cmakelists.patch19
2 files changed, 37 insertions, 13 deletions
diff --git a/testing/mariadb-connector-odbc/APKBUILD b/testing/mariadb-connector-odbc/APKBUILD
index dc0d87f4de..6c8f6752f4 100644
--- a/testing/mariadb-connector-odbc/APKBUILD
+++ b/testing/mariadb-connector-odbc/APKBUILD
@@ -1,17 +1,17 @@
# Contributor: Joe Searle <joe@jsearle.net>
# Maintainer: Joe Searle <joe@jsearle.net>
pkgname=mariadb-connector-odbc
-pkgver=3.1.4
-pkgrel=1
-pkgdesc="MariaDB Connector/ODBC is a standardized, LGPL licensed database driver using the industry standard ODBC API."
+pkgver=3.1.11
+pkgrel=0
+pkgdesc="MariaDB Connector/ODBC database driver"
url="https://github.com/MariaDB/mariadb-connector-odbc"
arch="all"
license="LGPL-2.1-only"
-depends="unixodbc"
-makedepends="cmake unixodbc-dev mariadb-connector-c mariadb-connector-c-dev mariadb-static"
-source="$pkgname-$pkgver.tar.gz::https://github.com/MariaDB/mariadb-connector-odbc/archive/$pkgver.tar.gz"
-subpackages="$pkgname-doc"
options="!check" # 'test' directory not included in releases
+makedepends="cmake unixodbc-dev mariadb-connector-c-dev mariadb-static"
+source="$pkgname-$pkgver.tar.gz::https://github.com/MariaDB/mariadb-connector-odbc/archive/$pkgver.tar.gz
+ cmakelists.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -19,17 +19,22 @@ build() {
fi
# Link to /usr/include/mysql necessary when using system installed mariadb-connector-c
CFLAGS="$CFLAGS -I/usr/include/mysql" \
- cmake \
+ cmake -B build \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=None \
- ${CMAKE_CROSSOPTS} .
- make
+ -DUSE_SYSTEM_INSTALLED_LIB=True \
+ -DWITH_SSL=OPENSSL \
+ $CMAKE_CROSSOPTS .
+ make -C build
}
package() {
- make DESTDIR="$pkgdir" install
+ make -C build DESTDIR="$pkgdir" install
+
+ # Remove license files
+ rm -rf "$pkgdir"/usr/docs
}
-sha512sums="1f662b57d78cb6b58de84b75025bbc16cdfebeea39991d0a8f28ff2be76682ea80f2a8828c006c966607eebb0fb6522bc59a98564c6a7408b878d8ba06d9ed9b mariadb-connector-odbc-3.1.4.tar.gz"
+sha512sums="7c1f68ecfb8f860d9ce3d9eaaab7ccaed8566d90e8840b7e0a80372793160f95968a2bcd9fb37292f2ffecb89bdf8c42c0273748c6ccdc374cb6eeaf9d190216 mariadb-connector-odbc-3.1.11.tar.gz
+2f64bf5149c502c6924fa9e07d5e0a8bc4ba9fc3c58ba1542dcc5d7246cb31729f289a55977d0fa920bca102923b280dcf345147ef9bc0cb4d22b1dff77d836d cmakelists.patch"
diff --git a/testing/mariadb-connector-odbc/cmakelists.patch b/testing/mariadb-connector-odbc/cmakelists.patch
new file mode 100644
index 0000000000..9df964d4d4
--- /dev/null
+++ b/testing/mariadb-connector-odbc/cmakelists.patch
@@ -0,0 +1,19 @@
+Patch from FreeBSD - https://svnweb.freebsd.org/ports/head/databases/mariadb-connector-odbc/files/patch-CMakeLists.txt?view=log&pathrev=558761
+
+Fix libcrypto & libssl linking issue:
+...
+Error relocating /usr/lib/libmaodbc.so: SSL_free: symbol not found
+Error relocating /usr/lib/libmaodbc.so: compress: symbol not found
+...
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -229,7 +229,7 @@ IF(WIN32)
+ ENDIF()
+ ELSE()
+ SEARCH_LIBRARY(LIB_MATH floor m)
+- SET(PLATFORM_DEPENDENCIES ${LIB_MATH})
++ SET(PLATFORM_DEPENDENCIES ${PLATFORM_DEPENDENCIES} ${LIB_MATH})
+ SET (MARIADB_ODBC_SOURCES ${MARIADB_ODBC_SOURCES}
+ ma_platform_posix.c
+ ma_conv_charset.c)