summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonzalo Exequiel Pedone2024-08-20 23:22:11 -0300
committerGonzalo Exequiel Pedone2024-08-20 23:22:11 -0300
commitad3c363e690257e708f51be858d890ab07382f5e (patch)
tree72bc3945a87ee27c8459ca245763d64d9f49c7b1
parent62f89f738200e9b84f5dc112a6e176ef94142f2b (diff)
downloadaur-ad3c363e690257e708f51be858d890ab07382f5e.tar.gz
Package updated to 11.5.2.
-rw-r--r--.SRCINFO25
-rw-r--r--0001-Disable-gssapi.patch6
-rw-r--r--PKGBUILD36
3 files changed, 38 insertions, 29 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8add0e5c057c..41a9b1a41bf8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
pkgbase = android-armv7a-eabi-mariadb
pkgdesc = Fast SQL database server, derived from MySQL (Android armv7a-eabi)
- pkgver = 11.4.2
+ pkgver = 11.5.2
pkgrel = 1
url = https://mariadb.org/
arch = any
+ groups = android-mariadb
license = GPL
makedepends = android-cmake
makedepends = android-armv7a-eabi-boost
@@ -42,8 +43,8 @@ pkgbase = android-armv7a-eabi-mariadb
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.4.2/source/mariadb-11.4.2.tar.gz
- source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.4.2/source/mariadb-11.4.2.tar.gz.asc
+ source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.5.2/source/mariadb-11.5.2.tar.gz
+ source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.5.2/source/mariadb-11.5.2.tar.gz.asc
source = 0001-Disable-gssapi.patch
source = 0002-Remove-setpwent.patch
source = 0003-Remove-strchr.patch
@@ -52,14 +53,14 @@ pkgbase = android-armv7a-eabi-mariadb
source = 0006-Remove-endpwent.patch
source = 0008-Fix-ncurses-headers.patch
validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8
- sha256sums = 8c600e38adb899316c1cb11c68b87979668f4fb9d858000e347e6d8b7abe51b0
- sha256sums = SKIP
- sha256sums = 387ad00885efee2cfad861445c477121dcda294df3112204fb3197235254f7d0
- sha256sums = f38a62d8fcf13a63c1368816ae9f97505f73343941ca667d91adf8f51176787e
- sha256sums = 281f85613b325d1cc35ea3701d8a7cb54971389a23ad9e90df0214d3672174d5
- sha256sums = d025b6710cbca6e64d395b322d622ef1b1bb868893ee0550150d5ff5000c2d57
- sha256sums = 21529ea4e45530f43b393e117b9263ad5b19c452d67396b6fe8cfc7651b9296b
- sha256sums = 909d2b7893864c31dea42b92e1593d4dc9abecfa5db50fd5c0a3864e72023d2f
- sha256sums = f9dccbec9b8bc20aacfc73c92dac3a0496ab9eaac5d772b991e943a232163eb1
+ md5sums = b1387fc485b7c802615ea6b9835b6b9c
+ md5sums = SKIP
+ md5sums = fe9715a2a09603a0e95d087481a3dfc8
+ md5sums = 8f2f84a58b52e348ebdb9a1cf385eb00
+ md5sums = 068a65705c097321d40cadaaafe37429
+ md5sums = 05ce29a22db5d51618eb62fd01cf77ed
+ md5sums = 7b53dfa88c8b7a83fad76c454222d9f7
+ md5sums = 481e93621e4c2e040b4eb380904e1865
+ md5sums = bd8ebd1967c42f660dcd59503ca0213d
pkgname = android-armv7a-eabi-mariadb
diff --git a/0001-Disable-gssapi.patch b/0001-Disable-gssapi.patch
index c4b5ffd044cc..5527e8d17417 100644
--- a/0001-Disable-gssapi.patch
+++ b/0001-Disable-gssapi.patch
@@ -20,8 +20,8 @@
ADD_SUBDIRECTORY(libmariadb)
--- a/libmariadb/plugins/auth/CMakeLists.txt
+++ b/libmariadb/plugins/auth/CMakeLists.txt
-@@ -94,38 +94,6 @@
- ENDIF()
+@@ -131,38 +131,6 @@
+
ENDIF()
-#GSSAPI client authentication plugin
@@ -46,7 +46,7 @@
- CONFIGURATIONS DYNAMIC STATIC OFF DYNAMIC_AND_STATIC
- DEFAULT ${AUTH_GSSAPI_DEFAULT_CONFIG}
- SOURCES ${GSSAPI_SOURCES}
-- INCLUDES ${CC_SOURCE_DIR}/plugins/auth ${GSSAPI_INCS}
+- INCLUDES ${AUTH_DIR} ${GSSAPI_INCS}
- LIBRARIES ${GSSAPI_LIBS})
- IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
- SET_SOURCE_FILES_PROPERTIES(${GSSAPI_SOURCES} PROPERTY COMPILE_FLAGS "-Wno-deprecated-declarations")
diff --git a/PKGBUILD b/PKGBUILD
index 90c3affd920f..24a441dae764 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,11 +5,12 @@ _android_arch=armv7a-eabi
pkgname=android-${_android_arch}-mariadb
pkgdesc="Fast SQL database server, derived from MySQL (Android ${_android_arch})"
-pkgver=11.4.2
+pkgver=11.5.2
pkgrel=1
arch=('any')
license=('GPL')
url='https://mariadb.org/'
+groups=('android-mariadb')
depends=("android-${_android_arch}-bzip2"
"android-${_android_arch}-jemalloc"
"android-${_android_arch}-liburing"
@@ -56,19 +57,19 @@ source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-$
'0005-Add-missing-headers.patch'
'0006-Remove-endpwent.patch'
'0008-Fix-ncurses-headers.patch')
-sha256sums=('8c600e38adb899316c1cb11c68b87979668f4fb9d858000e347e6d8b7abe51b0'
- 'SKIP'
- '387ad00885efee2cfad861445c477121dcda294df3112204fb3197235254f7d0'
- 'f38a62d8fcf13a63c1368816ae9f97505f73343941ca667d91adf8f51176787e'
- '281f85613b325d1cc35ea3701d8a7cb54971389a23ad9e90df0214d3672174d5'
- 'd025b6710cbca6e64d395b322d622ef1b1bb868893ee0550150d5ff5000c2d57'
- '21529ea4e45530f43b393e117b9263ad5b19c452d67396b6fe8cfc7651b9296b'
- '909d2b7893864c31dea42b92e1593d4dc9abecfa5db50fd5c0a3864e72023d2f'
- 'f9dccbec9b8bc20aacfc73c92dac3a0496ab9eaac5d772b991e943a232163eb1')
+md5sums=('b1387fc485b7c802615ea6b9835b6b9c'
+ 'SKIP'
+ 'fe9715a2a09603a0e95d087481a3dfc8'
+ '8f2f84a58b52e348ebdb9a1cf385eb00'
+ '068a65705c097321d40cadaaafe37429'
+ '05ce29a22db5d51618eb62fd01cf77ed'
+ '7b53dfa88c8b7a83fad76c454222d9f7'
+ '481e93621e4c2e040b4eb380904e1865'
+ 'bd8ebd1967c42f660dcd59503ca0213d')
validpgpkeys=('177F4010FE56CA3336300305F1656F24C74CD1D8') # MariaDB Signing Key <signing-key@mariadb.org>
prepare() {
- cd "${srcdir}/mariadb-$pkgver"
+ cd "${srcdir}/mariadb-${pkgver}"
source android-env ${_android_arch}
patch -Np1 -i ../0001-Disable-gssapi.patch
@@ -89,10 +90,15 @@ prepare() {
rm -rf plugin/auth_gssapi
rm -f libmariadb/cmake/FindGSSAPI.cmake
+
+# CMake Error: try_run() invoked in cross-compiling mode, please set the following cache variables appropriately:
+# HAVE_SYSTEM_LIBFMT_EXITCODE (advanced)
+# For details see /home/hipersayan_x/Documentos/CarpetaPersonal/Proyectos/ArchPackages/android-mariadb/android-aarch64-mariadb/src/mariadb-11.5.2/build/TryRunResults.cmake
+
}
build() {
- cd "${srcdir}/mariadb-$pkgver"
+ cd "${srcdir}/mariadb-${pkgver}"
unset CC
unset CXX
@@ -145,6 +151,7 @@ build() {
-DPLUGIN_FEEDBACK=NO \
-DWITH_EXTRA_CHARSETS=complex \
-DWITH_JEMALLOC=ON \
+ -DWITH_LIBFMT=system \
-DWITH_LIBWRAP=OFF \
-DWITH_PCRE2=system \
-DWITH_READLINE=ON \
@@ -180,12 +187,13 @@ build() {
-DSNAPPY_LIBRARIES="${ANDROID_PREFIX_LIB}/libsnappy.so" \
-DSNAPPY_INCLUDE_DIRS="${ANDROID_PREFIX_INCLUDE}" \
-DJudy_INCLUDE_DIRS="${ANDROID_PREFIX_INCLUDE}" \
- -DJudy_LIBRARIES="${ANDROID_PREFIX_LIB}/libljudy.so"
+ -DJudy_LIBRARIES="${ANDROID_PREFIX_LIB}/libljudy.so" \
+ -DLIBFMT_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}"
make -C build $MAKEFLAGS
}
package() {
- cd "${srcdir}/mariadb-$pkgver"
+ cd "${srcdir}/mariadb-${pkgver}"
source android-env ${_android_arch}
make -C build DESTDIR="${pkgdir}" install