diff options
| author | Gonzalo Exequiel Pedone | 2025-03-18 23:48:33 -0300 |
|---|---|---|
| committer | Gonzalo Exequiel Pedone | 2025-03-18 23:48:33 -0300 |
| commit | bc1c8710991242b3f9075a77522cad3f4c309eb3 (patch) | |
| tree | 08a93dc582599b4ac13f992bf11af5c369495398 | |
| parent | df289415caa9938a994c3e6a7ded7f0d1aba744f (diff) | |
| download | aur-android-x86-64-mariadb.tar.gz | |
Package updated to 11.7.2.
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | 0001-Disable-gssapi.patch | 8 | ||||
| -rw-r--r-- | 0007-Fix-missing-builtin-in-riscv.patch | 11 | ||||
| -rw-r--r-- | PKGBUILD | 36 |
4 files changed, 44 insertions, 24 deletions
@@ -1,12 +1,13 @@ pkgbase = android-x86-64-mariadb pkgdesc = Fast SQL database server, derived from MySQL (Android x86-64) - pkgver = 11.5.2 + pkgver = 11.7.2 pkgrel = 1 url = https://mariadb.org/ arch = any groups = android-mariadb license = GPL makedepends = android-cmake + makedepends = judy makedepends = android-x86-64-boost makedepends = android-x86-64-bzip2 makedepends = android-x86-64-cracklib @@ -43,24 +44,26 @@ pkgbase = android-x86-64-mariadb options = !buildflags options = staticlibs options = !emptydirs - 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 = https://rsync.osuosl.org/pub/mariadb/mariadb-11.7.2/source/mariadb-11.7.2.tar.gz + source = https://rsync.osuosl.org/pub/mariadb/mariadb-11.7.2/source/mariadb-11.7.2.tar.gz.asc source = 0001-Disable-gssapi.patch source = 0002-Remove-setpwent.patch source = 0003-Remove-strchr.patch source = 0004-Dont-read-PEM-keys.patch source = 0005-Add-missing-headers.patch source = 0006-Remove-endpwent.patch + source = 0007-Fix-missing-builtin-in-riscv.patch source = 0008-Fix-ncurses-headers.patch validpgpkeys = 177F4010FE56CA3336300305F1656F24C74CD1D8 - md5sums = b1387fc485b7c802615ea6b9835b6b9c + md5sums = 52d864795caeeaad3efe4321fc107301 md5sums = SKIP - md5sums = fe9715a2a09603a0e95d087481a3dfc8 + md5sums = 4c9ae845bf4e50a9b0f5e74c888de9ff md5sums = 8f2f84a58b52e348ebdb9a1cf385eb00 md5sums = 068a65705c097321d40cadaaafe37429 md5sums = 05ce29a22db5d51618eb62fd01cf77ed md5sums = 7b53dfa88c8b7a83fad76c454222d9f7 md5sums = 481e93621e4c2e040b4eb380904e1865 + md5sums = 904d67433581cd450c75cb9a9260a8d2 md5sums = bd8ebd1967c42f660dcd59503ca0213d pkgname = android-x86-64-mariadb diff --git a/0001-Disable-gssapi.patch b/0001-Disable-gssapi.patch index 5527e8d17417..3e319a7d97f4 100644 --- a/0001-Disable-gssapi.patch +++ b/0001-Disable-gssapi.patch @@ -1,6 +1,6 @@ --- a/libmariadb/CMakeLists.txt +++ b/libmariadb/CMakeLists.txt -@@ -419,17 +419,6 @@ +@@ -434,17 +434,6 @@ ADD_DEFINITIONS("-DHAVE_REMOTEIO=1") ENDIF() ENDIF() @@ -20,7 +20,7 @@ ADD_SUBDIRECTORY(libmariadb) --- a/libmariadb/plugins/auth/CMakeLists.txt +++ b/libmariadb/plugins/auth/CMakeLists.txt -@@ -131,38 +131,6 @@ +@@ -122,38 +122,6 @@ ENDIF() @@ -42,7 +42,7 @@ -ENDIF() -IF(GSSAPI_SOURCES) - REGISTER_PLUGIN(TARGET auth_gssapi_client -- TYPE MARIADB_CLIENT_PLUGIN_AUTH +- TYPE AUTH - CONFIGURATIONS DYNAMIC STATIC OFF DYNAMIC_AND_STATIC - DEFAULT ${AUTH_GSSAPI_DEFAULT_CONFIG} - SOURCES ${GSSAPI_SOURCES} @@ -58,4 +58,4 @@ - # old_password plugin REGISTER_PLUGIN(TARGET mysql_old_password - TYPE MARIADB_CLIENT_PLUGIN_AUTH + TYPE AUTH diff --git a/0007-Fix-missing-builtin-in-riscv.patch b/0007-Fix-missing-builtin-in-riscv.patch new file mode 100644 index 000000000000..5be7d1b2f018 --- /dev/null +++ b/0007-Fix-missing-builtin-in-riscv.patch @@ -0,0 +1,11 @@ +--- a/include/my_cpu.h ++++ b/include/my_cpu.h +@@ -96,8 +96,6 @@ + #elif defined(_ARCH_PWR8) + /* Changed from __ppc_get_timebase for musl and clang compatibility */ + __builtin_ppc_get_timebase(); +-#elif defined __GNUC__ && defined __riscv +- __builtin_riscv_pause(); + #elif defined __GNUC__ + /* Mainly, prevent the compiler from optimizing away delay loops */ + __asm__ __volatile__ ("":::"memory"); @@ -5,7 +5,7 @@ _android_arch=x86-64 pkgname=android-${_android_arch}-mariadb pkgdesc="Fast SQL database server, derived from MySQL (Android ${_android_arch})" -pkgver=11.5.2 +pkgver=11.7.2 pkgrel=1 arch=('any') license=('GPL') @@ -25,6 +25,7 @@ depends=("android-${_android_arch}-bzip2" "android-${_android_arch}-zlib" "android-${_android_arch}-zstd") makedepends=('android-cmake' + 'judy' "android-${_android_arch}-boost" "android-${_android_arch}-bzip2" "android-${_android_arch}-cracklib" @@ -56,15 +57,17 @@ source=("https://rsync.osuosl.org/pub/mariadb/mariadb-${pkgver}/source/mariadb-$ '0004-Dont-read-PEM-keys.patch' '0005-Add-missing-headers.patch' '0006-Remove-endpwent.patch' + '0007-Fix-missing-builtin-in-riscv.patch' '0008-Fix-ncurses-headers.patch') -md5sums=('b1387fc485b7c802615ea6b9835b6b9c' +md5sums=('52d864795caeeaad3efe4321fc107301' 'SKIP' - 'fe9715a2a09603a0e95d087481a3dfc8' + '4c9ae845bf4e50a9b0f5e74c888de9ff' '8f2f84a58b52e348ebdb9a1cf385eb00' '068a65705c097321d40cadaaafe37429' '05ce29a22db5d51618eb62fd01cf77ed' '7b53dfa88c8b7a83fad76c454222d9f7' '481e93621e4c2e040b4eb380904e1865' + '904d67433581cd450c75cb9a9260a8d2' 'bd8ebd1967c42f660dcd59503ca0213d') validpgpkeys=('177F4010FE56CA3336300305F1656F24C74CD1D8') # MariaDB Signing Key <signing-key@mariadb.org> @@ -76,6 +79,7 @@ prepare() { patch -Np1 -i ../0003-Remove-strchr.patch patch -Np1 -i ../0004-Dont-read-PEM-keys.patch patch -Np1 -i ../0005-Add-missing-headers.patch + patch -Np1 -i ../0007-Fix-missing-builtin-in-riscv.patch patch -Np1 -i ../0008-Fix-ncurses-headers.patch if [ "${ANDROID_MINIMUM_PLATFORM}" -lt 26 ]; then @@ -90,11 +94,6 @@ 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() { @@ -114,7 +113,7 @@ build() { unset RANLIB unset STRIP - cmake -S . -B cross-build + cmake -S . -B cross-build -Wno-dev make -C cross-build import_executables source android-env ${_android_arch} @@ -125,10 +124,12 @@ build() { android-${_android_arch}-cmake \ -S . \ - -B build \ + -B build-shared \ -DCOMPILATION_COMMENT="Android ${ANDROID_MINIMUM_PLATFORM} ${_android_arch}" \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -Wno-dev \ + -DWITH_PIC=ON \ + -DDISABLE_SHARED=OFF \ -DIMPORT_EXECUTABLES="${PWD}/cross-build/import_executables.cmake" \ -DINSTALL_SYSCONFDIR="${ANDROID_PREFIX_ETC}" \ -DINSTALL_SYSCONF2DIR="${ANDROID_PREFIX_ETC}/my.cnf.d" \ @@ -146,6 +147,7 @@ build() { -DDEFAULT_CHARSET=utf8mb4 \ -DDEFAULT_COLLATION=utf8mb4_unicode_ci \ -DENABLED_LOCAL_INFILE=ON \ + -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 \ -DPLUGIN_EXAMPLE=NO \ -DPLUGIN_FEDERATED=NO \ -DPLUGIN_FEEDBACK=NO \ @@ -168,10 +170,13 @@ build() { -DOPENSSL_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \ -DOPENSSL_CRYPTO_LIBRARY="${ANDROID_PREFIX_LIB}/libcrypto.so" \ -DOPENSSL_SSL_LIBRARY="${ANDROID_PREFIX_LIB}/libssl.so" \ - -DCURSES_INCLUDE_PATH="${ANDROID_PREFIX_INCLUDE}" \ - -DCURSES_LIBRARY="${ANDROID_PREFIX_LIB}/libcurses.so" \ - -DCURL_LIBRARY="${ANDROID_PREFIX_LIB}/libcurl.so" \ -DCURL_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \ + -DCURL_LIBRARY="${ANDROID_PREFIX_LIB}/libcurl.so" \ + -Dpkgcfg_lib_PC_CURL_curl="${ANDROID_PREFIX_LIB}/libcurl.so" \ + -DCURSES_INCLUDE_PATH="${ANDROID_PREFIX_INCLUDE}" \ + -DCURSES_CURSES_LIBRARY="${ANDROID_PREFIX_LIB}/libcurses.so" \ + -DCURSES_FORM_LIBRARY="${ANDROID_PREFIX_LIB}/libformw.so" \ + -DCURSES_NCURSES_LIBRARY="${ANDROID_PREFIX_LIB}/libncursesw.so" \ -DZSTD_LIBRARIES="${ANDROID_PREFIX_LIB}/libzstd.so" \ -DZSTD_INCLUDE_DIRS="${ANDROID_PREFIX_INCLUDE}" \ -DLIBXML2_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" \ @@ -189,14 +194,15 @@ build() { -DJudy_INCLUDE_DIRS="${ANDROID_PREFIX_INCLUDE}" \ -DJudy_LIBRARIES="${ANDROID_PREFIX_LIB}/libljudy.so" \ -DLIBFMT_INCLUDE_DIR="${ANDROID_PREFIX_INCLUDE}" - make -C build $MAKEFLAGS + make -C build-shared $MAKEFLAGS } package() { cd "${srcdir}/mariadb-${pkgver}" source android-env ${_android_arch} - make -C build DESTDIR="${pkgdir}" install + make -C build-shared DESTDIR="${pkgdir}" install + files=(mariadb mariadb_config mariadb-admin |