diff --git a/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch b/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch deleted file mode 100644 index 66e99c430f..0000000000 --- a/package/libdbi-drivers/0001-build-Use-MYSQL_CONFIG-variable-instead-of-mysql_con.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bc966656d8598a6d87c901a67ecdb91c436f4939 Mon Sep 17 00:00:00 2001 -From: Herve Codina -Date: Wed, 29 Sep 2021 15:08:33 +0200 -Subject: [PATCH] build: Use MYSQL_CONFIG variable instead of - 'mysql_config' - -The MYSQL_CONFIG variable is used to check 'mysql_config' prog. -This variable can be override by the user but was not used for -retrieving MYSQL_INCLUDE, MYSQL_LIBS, ... - -This commit replaces the hardcoded usage of 'mysql_config' by -the use of MYSQL_CONFIG variable. - -This lead to 'MYSQL_CONFIG=/some/where/mysql_config ./configure' -command to work properly. - -Signed-off-by: Herve Codina ---- - acinclude.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index e99318f..9dd2b0f 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -116,15 +116,15 @@ if test "$ac_mysql" = "yes"; then - fi - - if test "$ac_mysql_incdir" = "no"; then -- MYSQL_INCLUDE=`mysql_config --include` -+ MYSQL_INCLUDE=`$MYSQL_CONFIG --include` - else - MYSQL_INCLUDE=-I$ac_mysql_incdir - fi - if test "$ac_mysql_libdir" = "no"; then - if test "$ac_mysql_threadsafe" = "YES"; then -- MYSQL_LIBS=`mysql_config --libs_r` -+ MYSQL_LIBS=`$MYSQL_CONFIG --libs_r` - else -- MYSQL_LIBS=`mysql_config --libs` -+ MYSQL_LIBS=`$MYSQL_CONFIG --libs` - fi - else - if test "$ac_mysql_threadsafe" = "YES"; then --- -2.31.1 - diff --git a/package/libdbi-drivers/libdbi-drivers.hash b/package/libdbi-drivers/libdbi-drivers.hash index f6110c2a11..38d66f90d1 100644 --- a/package/libdbi-drivers/libdbi-drivers.hash +++ b/package/libdbi-drivers/libdbi-drivers.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0237c8006cefd6873f0b43d9676b14d5674270adf5e7501cd0e3423ff5b41549 libdbi-drivers-7a8e24ec1cf763226f4be31ba1018d888d4989f3-br1.tar.gz +sha256 564438dda6af59af8c66cda9fa378ce86b1393fd31a7b0f1ba98af641a34a428 libdbi-drivers-b0c7ac0ef2e733e858c9870139944eeaf7b66984-br1.tar.gz sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 COPYING diff --git a/package/libdbi-drivers/libdbi-drivers.mk b/package/libdbi-drivers/libdbi-drivers.mk index 78d1c61515..d86f32dafc 100644 --- a/package/libdbi-drivers/libdbi-drivers.mk +++ b/package/libdbi-drivers/libdbi-drivers.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBDBI_DRIVERS_VERSION = 7a8e24ec1cf763226f4be31ba1018d888d4989f3 +LIBDBI_DRIVERS_VERSION = b0c7ac0ef2e733e858c9870139944eeaf7b66984 LIBDBI_DRIVERS_SITE = https://git.code.sf.net/p/libdbi-drivers/libdbi-drivers LIBDBI_DRIVERS_SITE_METHOD = git LIBDBI_DRIVERS_LICENSE = LGPL-2.1+