diff --git a/fix-build-gcc14.patch b/fix-build-gcc14.patch new file mode 100644 index 0000000..c8abd56 --- /dev/null +++ b/fix-build-gcc14.patch @@ -0,0 +1,46 @@ +diff --git a/plugins/io/remote_io.c b/plugins/io/remote_io.c +index c06ecac..3deb144 100644 +--- a/plugins/io/remote_io.c ++++ b/plugins/io/remote_io.c +@@ -279,11 +279,11 @@ MA_FILE *ma_rio_open(const char *url,const char *operation) + MA_REMOTE_FILE *rf; + (void)operation; + +- if (!(file = (MA_FILE *)calloc(sizeof(MA_FILE), 1))) ++ if (!(file = (MA_FILE *)calloc(sizeof(MA_FILE) + 0, 1))) + return NULL; + + file->type= MA_FILE_REMOTE; +- if (!(file->ptr= rf= (MA_REMOTE_FILE *)calloc(sizeof(MA_REMOTE_FILE), 1))) ++ if (!(file->ptr= rf= (MA_REMOTE_FILE *)calloc(sizeof(MA_REMOTE_FILE) + 0, 1))) + { + free(file); + return NULL; +diff --git a/unittest/libmariadb/bulk1.c b/unittest/libmariadb/bulk1.c +index e1c31ea..7450acb 100644 +--- a/unittest/libmariadb/bulk1.c ++++ b/unittest/libmariadb/bulk1.c +@@ -74,8 +74,8 @@ static int bulk1(MYSQL *mysql) + + /* allocate memory */ + buffer= calloc(TEST_ARRAY_SIZE, sizeof(char *)); +- lengths= (unsigned long *)calloc(sizeof(long), TEST_ARRAY_SIZE); +- vals= (unsigned int *)calloc(sizeof(int), TEST_ARRAY_SIZE); ++ lengths= (unsigned long *)calloc(sizeof(long) + 0, TEST_ARRAY_SIZE); ++ vals= (unsigned int *)calloc(sizeof(int) + 0, TEST_ARRAY_SIZE); + + for (i=0; i < TEST_ARRAY_SIZE; i++) + { +diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c +index 804ef3e..39047df 100644 +--- a/unittest/libmariadb/ps_bugs.c ++++ b/unittest/libmariadb/ps_bugs.c +@@ -5159,7 +5159,7 @@ static int test_maxparam(MYSQL *mysql) + MYSQL_STMT *stmt= mysql_stmt_init(mysql); + MYSQL_BIND* bind; + +- bind = calloc(sizeof(MYSQL_BIND), 65535); ++ bind = calloc(sizeof(MYSQL_BIND) + 0, 65535); + + rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1"); + check_mysql_rc(rc, mysql); diff --git a/mariadb-connector-c.changes b/mariadb-connector-c.changes index 6976e24..4320d1e 100644 --- a/mariadb-connector-c.changes +++ b/mariadb-connector-c.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 8 10:49:30 UTC 2024 - Danilo Spinella + +- Fix build with gcc14, bsc#1221007 + * fix-build-gcc14.patch + ------------------------------------------------------------------- Fri Feb 23 11:16:54 UTC 2024 - pgajdos@suse.com diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec index fe37f82..1d0d146 100644 --- a/mariadb-connector-c.spec +++ b/mariadb-connector-c.spec @@ -38,6 +38,7 @@ Source2: mariadb.keyring Source3: baselibs.conf Patch1: mariadb-connector-c-2.3.1_unresolved_symbols.patch Patch4: private_library.patch +Patch5: fix-build-gcc14.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: pkgconfig