Skip to contentSkip to conversation

package/mariadb: bump version to 10.3.30

PATCH In review Peter Seiderer 3 participants 6 messages Jul 22, 2021 – Aug 5, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 package/mariadb: bump version to 10.3.30

- rebase 001-add-extra-check-for-librt.patch
- for changelog see [1], [2]

Fixes:

CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO):
Flow control statements are not properly nested.
Call Stack (most recent call first):
libmariadb/CMakeLists.txt:423 (INCLUDE)

[1] https://mariadb.com/kb/en/mariadb-10329-changelog/
[2] https://mariadb.com/kb/en/mariadb-10330-changelog/

---
 package/mariadb/0001-add-extra-check-for-librt.patch | 12 +++++++-----
 package/mariadb/mariadb.hash                         |  6 +++---
 package/mariadb/mariadb.mk                           |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
package/mariadb/0001-add-extra-check-for-librt.patch +7 -5
index 90aa626a0b..0dd4c546fb 100644
@@ -1,4 +1,4 @@
-From e6244400dfd3547531a3a3289fadbbe19873f096 Mon Sep 17 00:00:00 2001
+From 960c74ec60962f707bd41724edaa2640c0324400 Mon Sep 17 00:00:00 2001
 From: Ryan Coe <[email protected]>
 Date: Thu, 27 Oct 2016 20:33:21 -0700
 Subject: [PATCH] add extra check for librt
@@ -6,24 +6,26 @@ Subject: [PATCH] add extra check for librt
 https://jira.mariadb.org/browse/MDEV-10841
 
 Signed-off-by: Ryan Coe <[email protected]>
+[Rebased on mariadb-10.3.30]
+Signed-off-by: Peter Seiderer <[email protected]>
 ---
  configure.cmake | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/configure.cmake b/configure.cmake
-index 896226de954f4642a238ca6a72e0930590dc1681..77ca485fb05e6b63bb69f9561b4eabfaa208a419 100644
+index 1b85c31b..4a1cd847 100644
 --- a/configure.cmake
 +++ b/configure.cmake
-@@ -126,6 +126,9 @@ IF(UNIX)
+@@ -134,6 +134,9 @@ IF(UNIX)
    IF(NOT LIBRT)
      MY_SEARCH_LIBS(clock_gettime rt LIBRT)
    ENDIF()
 +  IF(NOT LIBRT)
 +    MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT)
 +  ENDIF()
+   set(THREADS_PREFER_PTHREAD_FLAG ON)
    FIND_PACKAGE(Threads)
  
-   SET(CMAKE_REQUIRED_LIBRARIES 
 -- 
-2.9.3
+2.32.0
 
package/mariadb/mariadb.hash +3 -3
index 26faf529c2..4025be317f 100644
@@ -1,6 +1,6 @@
-# From https://downloads.mariadb.org/mariadb/10.3.28
-sha256  e8c912cae2e5800d0da364cc23437907ed4be767f2cbdf198cf3afc03db6a6a3  mariadb-10.3.28.tar.gz
-sha512  f6941bcc818f9b3640e4b5fdbdd3a32b45c62c04087e583f1f0e1c0258b09a21c7639abd1c902e183c057838308ad5eedc00ffee76d44a02043e8e349015fb20  mariadb-10.3.28.tar.gz
+# From https://downloads.mariadb.org/mariadb/10.3.30
+sha256  bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b  mariadb-10.3.30.tar.gz
+sha512  742c30b3ebc0b6d36b98d4e7a7fb511098142e72d8f42cbfa73a0bdea2059be17e790fbda4732329bbd99e4b50b13cf18e8122964a473e0b62170ab869eca8fc  mariadb-10.3.30.tar.gz
 
 # Hash for license files
 sha256  a4665c1189fe31e0bbc27e9b55439df7dad6e99805407fe58d78da7aabe678f8  README.md
package/mariadb/mariadb.mk +1 -1
index 56d6afab17..ade73ccfe0 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-MARIADB_VERSION = 10.3.28
+MARIADB_VERSION = 10.3.30
 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source
 MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library)
 # Tarball no longer contains LGPL license text
Signature · 6 lines
2.32.0

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#1 lore raw

PATCH 2/2 package/mariadb: provide native compiled mariadb_config

- overwrite cross-compiled mariadb_config executable (used from the mysql_config script) by a native/host compiled one

Fixes (qt5base configure):

Trying source 0 (type mysqlConfig) of library mysql ...
+ .../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mysql_config --version

Quoted 1 line

.../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mysql_config: line 100: \

.../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config: cannot execute binary file: Exec format error

with

  $ file host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config
  host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config: ELF 64-bit LSB pie executable, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-aarch64.so.1, for GNU/Linux 5.10.0, with debug_info, not stripped
---
 package/mariadb/mariadb.mk | 8 ++++++++
 1 file changed, 8 insertions(+)
package/mariadb/mariadb.mk +8 -0
index ade73ccfe0..e0ac94f1c9 100644
@@ -135,5 +135,13 @@ endef
 
 MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL
 
+# overwrite cross-compiled mariadb_config executable by an native one
+define MARIADB_POST_STAGING_INSTALL
+	gcc -I$(@D)/libmariadb/include \
+		-o $(STAGING_DIR)/usr/bin/mariadb_config \
+		$(@D)/libmariadb/mariadb_config/mariadb_config.c
+endef
+MARIADB_POST_INSTALL_STAGING_HOOKS += MARIADB_POST_STAGING_INSTALL
+
 $(eval $(cmake-package))
 $(eval $(host-cmake-package))
Signature · 6 lines
2.32.0

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#2 lore raw

Re: [Buildroot] [PATCH v1 2/2] package/mariadb: provide native compiled mariadb_config

Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

- overwrite cross-compiled mariadb_config executable (used from the mysql_config script) by a native/host compiled one

Fixes (qt5base configure):

Trying source 0 (type mysqlConfig) of library mysql ...
+ .../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mysql_config --version

Quoted 1 line

.../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mysql_config: line 100: \

.../host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config: cannot execute binary file: Exec format error

Quoted 7 lines

with

  $ file host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config
  host/aarch64-buildroot-linux-gnu/sysroot/usr/bin/mariadb_config: ELF 64-bit LSB pie executable, ARM aarch64, version 1 (SYSV), dynamically linked, interpreter /lib/ld-linux-aarch64.so.1, for GNU/Linux 5.10.0, with debug_info, not stripped

Committed to 2021.02.x and 2021.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#3 lore raw
In reply to Peter Seiderer
Quoted 13 lines · On Thu, 22 Jul 2021 20:19:28 +0200 Peter Seiderer <[email protected]> wrote:

- rebase 001-add-extra-check-for-librt.patch
- for changelog see [1], [2]

Fixes:

CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO):
Flow control statements are not properly nested.
Call Stack (most recent call first):
libmariadb/CMakeLists.txt:423 (INCLUDE)

[1] https://mariadb.com/kb/en/mariadb-10329-changelog/
[2] https://mariadb.com/kb/en/mariadb-10330-changelog/

Quoted 6 lines
---
 package/mariadb/0001-add-extra-check-for-librt.patch | 12 +++++++-----
 package/mariadb/mariadb.hash                         |  6 +++---
 package/mariadb/mariadb.mk                           |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

Both applied. In the second patch, I've replaced the hardcoded "gcc" by $(HOSTCC).

Thanks,

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot
#4 lore raw

Hello Thomas,

Quoted 23 lines · Thomas Petazzoni
Quoted 13 lines · On Thu, 22 Jul 2021 20:19:28 +0200 Peter Seiderer <[email protected]> wrote:

- rebase 001-add-extra-check-for-librt.patch
- for changelog see [1], [2]

Fixes:

CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO):
Flow control statements are not properly nested.
Call Stack (most recent call first):
libmariadb/CMakeLists.txt:423 (INCLUDE)

[1] https://mariadb.com/kb/en/mariadb-10329-changelog/
[2] https://mariadb.com/kb/en/mariadb-10330-changelog/

Quoted 6 lines
---
 package/mariadb/0001-add-extra-check-for-librt.patch | 12 +++++++-----
 package/mariadb/mariadb.hash                         |  6 +++---
 package/mariadb/mariadb.mk                           |  2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)
Quoted 2 lines

Both applied. In the second patch, I've replaced the hardcoded "gcc" by $(HOSTCC).

Thanks for improving the patch...

Regards,
Peter

Quoted 4 lines

Thanks,

Thomas

_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot

#5 lore raw
In reply to Peter Seiderer
Quoted 12 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

- rebase 001-add-extra-check-for-librt.patch
- for changelog see [1], [2]

Fixes:

CMake Error at libmariadb/cmake/ConnectorName.cmake:30 (ENDMACRO):
Flow control statements are not properly nested.
Call Stack (most recent call first):
libmariadb/CMakeLists.txt:423 (INCLUDE)

Quoted 4 lines

[1] https://mariadb.com/kb/en/mariadb-10329-changelog/
[2] https://mariadb.com/kb/en/mariadb-10330-changelog/

Committed to 2021.02.x and 2021.05.x, thanks.

Signature · 5 lines
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
[email protected]
http://lists.busybox.net/mailman/listinfo/buildroot