Skip to content

Commit c4ee636

Browse files
authored
Multiple python updates + 3.14 initial package (#6767)
* python314: Initial package for version 3.14.0 * python310: Update from version 3.10.18 to 3.10.19 * python311: Update from version 3.11.13 to 3.11.14 * python312: Update from version 3.12.11 to 3.12.12 * python313: Update from version 3.13.7 to 3.13.8 * python314-wheels: Preliminary package wheel check * native/python310-314: Use requirement files instead in-Makefile This is taken from PR #6629 in order to automate wheel updates using github-action. * mariadb-connector-c: Enable libmysqlclient compatibility mode * pydantic-core: Update from version 2.27.2 to 2.41.4 In turn it was migrated to rust and no longer needs its own crossenv * python314: Add post_install to fix prefix in pkgconfig files * mariadb-connector-c: Use mysql compat mode and remove old mysql version * python31*: Update default crossenv pakage versions * python314: Mark as BROKEN pending PR #6766 * python314-wheels: Mark as BROKEN for now
1 parent cdb91db commit c4ee636

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+2063
-177
lines changed
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
PKG_NAME = mariadb-connector-c
2+
# Version 3.3.11 is the last known version to work with aarch64-6.2.4
3+
# Assembly error: Error: CFI instruction used without previous .cfi_startproc
4+
PKG_VERS = 3.3.11
5+
PKG_EXT = tar.gz
6+
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
7+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
8+
PKG_DIST_SITE = https://github.com/mariadb-corporation/mariadb-connector-c/archive
9+
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
10+
11+
HOMEPAGE = https://mariadb.com/kb/en/mariadb-connector-c/
12+
COMMENT = MariaDB C Connector
13+
LICENSE = LGPL
14+
15+
CMAKE_DISABLE_EXE_LINKER_FLAGS = 1
16+
17+
# MySQL specific:
18+
CMAKE_ARGS += -DWITH_UNIT_TESTS=OFF
19+
CMAKE_ARGS += -DDEFAULT_CHARSET=utf8
20+
CMAKE_ARGS += -DINSTALL_LIBDIR=lib
21+
22+
# Creates the following two synlinks:
23+
# - libmysqlclient.so -> libmariadb.so.3
24+
# - libmysqlclient_r.so -> libmariadb.so.3
25+
# Which in turns conflict with mysql-connector-c
26+
# - DISABLE unsupported mysql-connector-c
27+
CMAKE_ARGS += -DWITH_MYSQLCOMPAT=ON
28+
29+
# Does not handle pkgconfig well and fails to
30+
# find openssl3 include and libraries using
31+
# spksrc.python.mk thus using OPENSSL_STAGING_PREFIX
32+
DEPENDS += cross/openssl3
33+
CMAKE_ARGS += -DWITH_SSL=ON
34+
ifneq ($(wildcard $(OPENSSL_STAGING_PREFIX)),)
35+
CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARY:FILEPATH=$(OPENSSL_STAGING_PREFIX)/lib/libcrypto.so
36+
CMAKE_ARGS += -DOPENSSL_SSL_LIBRARY:FILEPATH=$(OPENSSL_STAGING_PREFIX)/lib/libssl.so
37+
CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR:PATH=$(OPENSSL_STAGING_PREFIX)/include
38+
endif
39+
40+
DEPENDS += cross/zlib
41+
CMAKE_ARGS += -DWITH_EXTERNAL_ZLIB=ON
42+
DEPENDS += cross/libiconv
43+
CMAKE_ARGS += -DWITH_ICONV=ON
44+
DEPENDS += cross/curl
45+
CMAKE_ARGS += -DWITH_CURL=ON
46+
47+
include ../../mk/spksrc.cross-cmake.mk
48+
49+
ifeq ($(call version_gt, $(TC_GCC), 4.9),1)
50+
ADDITIONAL_CFLAGS += -Wno-error=maybe-uninitialized
51+
# fails on evansport-6.2.4
52+
ADDITIONAL_CFLAGS += -Wno-error=strict-aliasing
53+
endif
54+
55+
ifeq ($(call version_lt, $(TC_GCC), 4.9),1)
56+
ADDITIONAL_CFLAGS += -std=gnu99
57+
# fails on 88f6281-6.2.4
58+
ADDITIONAL_CFLAGS += -Wno-error=missing-field-initializers
59+
ADDITIONAL_CFLAGS += -Wno-error=uninitialized
60+
# fails on hi3535-6.2.4
61+
ADDITIONAL_CFLAGS += -Wno-error=array-bounds
62+
endif

cross/mariadb-connector-c/PLIST renamed to cross/mariadb-connector-c-3.3.11/PLIST

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
bin:bin/mariadb_config
22
lnk:lib/libmariadb.so
33
lib:lib/libmariadb.so.3
4+
lnk:lib/libmysqlclient.so
5+
lnk:lib/libmysqlclient_r.so
46
lib:lib/mariadb/plugin/caching_sha2_password.so
57
lib:lib/mariadb/plugin/client_ed25519.so
68
lib:lib/mariadb/plugin/dialog.so
File renamed without changes.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
PKG_NAME = mariadb-connector-c
2+
PKG_VERS = 3.4.7
3+
PKG_EXT = tar.gz
4+
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
5+
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
6+
PKG_DIST_SITE = https://github.com/mariadb-corporation/mariadb-connector-c/archive
7+
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
8+
9+
HOMEPAGE = https://mariadb.com/kb/en/mariadb-connector-c/
10+
COMMENT = MariaDB C Connector
11+
LICENSE = LGPL
12+
13+
REQUIRED_MIN_DSM = 7.1
14+
UNSUPPORTED_ARCHS = comcerto2k
15+
16+
CMAKE_DISABLE_EXE_LINKER_FLAGS = 1
17+
18+
# MySQL specific:
19+
CMAKE_ARGS += -DWITH_UNIT_TESTS=OFF
20+
CMAKE_ARGS += -DDEFAULT_CHARSET=utf8
21+
CMAKE_ARGS += -DINSTALL_LIBDIR=lib
22+
23+
# Creates the following two synlinks:
24+
# - libmysqlclient.so -> libmariadb.so.3
25+
# - libmysqlclient_r.so -> libmariadb.so.3
26+
# Which in turns conflict with mysql-connector-c
27+
# - DISABLE unsupported mysql-connector-c
28+
CMAKE_ARGS += -DWITH_MYSQLCOMPAT=ON
29+
30+
# Does not handle pkgconfig well and fails to
31+
# find openssl3 include and libraries using
32+
# spksrc.python.mk thus using OPENSSL_STAGING_PREFIX
33+
DEPENDS += cross/openssl3
34+
CMAKE_ARGS += -DWITH_SSL=ON
35+
ifneq ($(wildcard $(OPENSSL_STAGING_PREFIX)),)
36+
CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARY:FILEPATH=$(OPENSSL_STAGING_PREFIX)/lib/libcrypto.so
37+
CMAKE_ARGS += -DOPENSSL_SSL_LIBRARY:FILEPATH=$(OPENSSL_STAGING_PREFIX)/lib/libssl.so
38+
CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR:PATH=$(OPENSSL_STAGING_PREFIX)/include
39+
endif
40+
41+
DEPENDS += cross/zlib
42+
CMAKE_ARGS += -DWITH_EXTERNAL_ZLIB=ON
43+
DEPENDS += cross/libiconv
44+
CMAKE_ARGS += -DWITH_ICONV=ON
45+
DEPENDS += cross/curl
46+
CMAKE_ARGS += -DWITH_CURL=ON
47+
48+
include ../../mk/spksrc.cross-cmake.mk
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
bin:bin/mariadb_config
2+
lnk:lib/libmariadb.so
3+
lib:lib/libmariadb.so.3
4+
lnk:lib/libmysqlclient.so
5+
lnk:lib/libmysqlclient_r.so
6+
lib:lib/mariadb/plugin/caching_sha2_password.so
7+
lib:lib/mariadb/plugin/client_ed25519.so
8+
lib:lib/mariadb/plugin/dialog.so
9+
lib:lib/mariadb/plugin/mysql_clear_password.so
10+
lib:lib/mariadb/plugin/parsec.so
11+
lib:lib/mariadb/plugin/remote_io.so
12+
lib:lib/mariadb/plugin/sha256_password.so
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
mariadb-connector-c-3.4.7.tar.gz SHA1 6e6f8f8f389474acbfc344ce86ee092af143b3bd
2+
mariadb-connector-c-3.4.7.tar.gz SHA256 cf81cd1c71c3199da9d2125aee840cb6083d43e1ea4c60c4be5045bfc7824eba
3+
mariadb-connector-c-3.4.7.tar.gz MD5 52df108d6fb7bd88de90e0e22e1a5a72

cross/mariadb-connector-c/Makefile

Lines changed: 8 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,12 @@
1-
PKG_NAME = mariadb-connector-c
2-
# Version 3.3.11 is the last known version to work with aarch64-6.2.4
3-
# Assembly error: Error: CFI instruction used without previous .cfi_startproc
4-
PKG_VERS = 3.3.11
5-
PKG_EXT = tar.gz
6-
PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
7-
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
8-
PKG_DIST_SITE = https://github.com/mariadb-corporation/mariadb-connector-c/archive
9-
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
1+
PKG_NAME = mariadb-connector-c-main
102

11-
HOMEPAGE = https://mariadb.com/kb/en/mariadb-connector-c/
12-
COMMENT = MariaDB C Connector
13-
LICENSE = LGPL
3+
OPTIONAL_DEPENDS = cross/mariadb-connector-c-latest
4+
OPTIONAL_DEPENDS += cross/mariadb-connector-c-3.3.11
145

15-
CMAKE_DISABLE_EXE_LINKER_FLAGS = 1
6+
include ../../mk/spksrc.main-depends.mk
167

17-
include ../../mk/spksrc.cross-cmake.mk
18-
19-
ifeq ($(call version_gt, $(TC_GCC), 4.9),1)
20-
ADDITIONAL_CFLAGS += -Wno-error=maybe-uninitialized
21-
# fails on evansport-6.2.4
22-
ADDITIONAL_CFLAGS += -Wno-error=strict-aliasing
23-
endif
24-
25-
ifeq ($(call version_lt, $(TC_GCC), 4.9),1)
26-
ADDITIONAL_CFLAGS += -std=gnu99
27-
# fails on 88f6281-6.2.4
28-
ADDITIONAL_CFLAGS += -Wno-error=missing-field-initializers
29-
ADDITIONAL_CFLAGS += -Wno-error=uninitialized
30-
# fails on hi3535-6.2.4
31-
ADDITIONAL_CFLAGS += -Wno-error=array-bounds
32-
endif
33-
34-
# MySQL specific:
35-
CMAKE_ARGS += -DWITH_UNIT_TESTS=OFF
36-
CMAKE_ARGS += -DDEFAULT_CHARSET=utf8
37-
CMAKE_ARGS += -DINSTALL_LIBDIR=lib
38-
39-
# Creates the following two synlinks:
40-
# - libmysqlclient.so -> libmariadb.so.3
41-
# - libmysqlclient_r.so -> libmariadb.so.3
42-
# Which in turns conflict with mysql-connector-c
43-
#CMAKE_ARGS += -DWITH_MYSQLCOMPAT=ON
44-
45-
# Does not handle pkgconfig well and fails to
46-
# find openssl3 include and libraries using
47-
# spksrc.python.mk thus using OPENSSL_STAGING_PREFIX
48-
DEPENDS += cross/openssl3
49-
CMAKE_ARGS += -DWITH_SSL=ON
50-
ifneq ($(wildcard $(OPENSSL_STAGING_PREFIX)),)
51-
CMAKE_ARGS += -DOPENSSL_CRYPTO_LIBRARY:FILEPATH=$(OPENSSL_STAGING_PREFIX)/lib/libcrypto.so
52-
CMAKE_ARGS += -DOPENSSL_SSL_LIBRARY:FILEPATH=$(OPENSSL_STAGING_PREFIX)/lib/libssl.so
53-
CMAKE_ARGS += -DOPENSSL_INCLUDE_DIR:PATH=$(OPENSSL_STAGING_PREFIX)/include
8+
ifeq ($(call version_ge, ${TC_GCC}, 5),1)
9+
DEPENDS = cross/mariadb-connector-c-latest
10+
else
11+
DEPENDS = cross/mariadb-connector-c-3.3.11
5412
endif
55-
56-
DEPENDS += cross/zlib
57-
CMAKE_ARGS += -DWITH_EXTERNAL_ZLIB=ON
58-
DEPENDS += cross/libiconv
59-
CMAKE_ARGS += -DWITH_ICONV=ON
60-
DEPENDS += cross/curl
61-
CMAKE_ARGS += -DWITH_CURL=ON

cross/python310/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python310
2-
PKG_VERS = 3.10.18
2+
PKG_VERS = 3.10.19
33
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
44
PKG_EXT = tar.xz
55
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)

cross/python310/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Python-3.10.18.tar.xz SHA1 2b59becca67037125c08a82519beccfdb98a48cc
2-
Python-3.10.18.tar.xz SHA256 ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f
3-
Python-3.10.18.tar.xz MD5 14ea0982a7dd4dbfc3f50537c723df41
1+
Python-3.10.19.tar.xz SHA1 a5606a32a67421dc62dd0f5b6d00d35c93bbdae4
2+
Python-3.10.19.tar.xz SHA256 c8f4a596572201d81dd7df91f70e177e19a70f1d489968b54b5fbbf29a97c076
3+
Python-3.10.19.tar.xz MD5 ff2739df51da5475e55dbf023d594894

cross/python311/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = python311
2-
PKG_VERS = 3.11.13
2+
PKG_VERS = 3.11.14
33
PKG_VERS_MAJOR_MINOR = $(word 1,$(subst ., ,$(PKG_VERS))).$(word 2,$(subst ., ,$(PKG_VERS)))
44
PKG_EXT = tar.xz
55
PKG_DIST_NAME = Python-$(PKG_VERS).$(PKG_EXT)

0 commit comments

Comments
 (0)