Skip to content

Commit b377e42

Browse files
oetikeroetiker
authored
Merge pull request #3475 from citrus-it/py312
Adding python3.12
2 parents 4444e36 + a65ea7a commit b377e42

File tree

127 files changed

+7755
-9
lines changed

Some content is hidden

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

127 files changed

+7755
-9
lines changed

‎build/meta/illumos-tools.p5m

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ depend fmri=system/library/mozilla-nss type=require
3232
depend fmri=system/header type=require
3333
depend fmri=system/management/snmp/net-snmp type=require
3434
depend fmri=text/gnu-gettext type=require
35-
depend fmri=runtime/python-27 type=require
3635
depend fmri=runtime/python-311 type=require
36+
depend fmri=runtime/python-312 type=require

‎build/meta/omnios-build-tools.p5m

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ depend fmri=pkg://$(PKGPUBLISHER)/runtime/java/openjdk21 type=require
5757
depend fmri=pkg://$(PKGPUBLISHER)/runtime/perl type=require
5858
depend fmri=pkg://$(PKGPUBLISHER)/runtime/python-27 type=require
5959
depend fmri=pkg://$(PKGPUBLISHER)/runtime/python-311 type=require
60+
depend fmri=pkg://$(PKGPUBLISHER)/runtime/python-312 type=require
6061
depend fmri=pkg://$(PKGPUBLISHER)/service/network/tftp type=require
6162
depend fmri=pkg://$(PKGPUBLISHER)/system/header/header-audio type=require
6263
depend fmri=pkg://$(PKGPUBLISHER)/system/library type=require

‎build/ncurses/local.mog

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# source. A copy of the CDDL is also available via the Internet at
99
# http://www.illumos.org/license/CDDL.
1010

11-
# Copyright 2020 OmniOS Community Edition (OmniOSce) Association.
11+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
1212

1313
license COPYING license=MIT
1414

@@ -22,3 +22,6 @@ license COPYING license=MIT
2222
# Drop the legacy ABI config binaries
2323
<transform path=.*ncurses5-config -> drop>
2424

25+
# Drop static libraries
26+
<transform file path=.*\.a$ -> drop>
27+

‎build/ncurses/patches/drop-rin-from-screen-256color.diff

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Description: Remove "rin" from screen-256color
77
Bug-Debian: https://bugs.debian.org/933572
88
Last-Update: 2019-08-07
99

10-
diff -wpruN '--exclude=*.orig' a~/misc/terminfo.src a/misc/terminfo.src
10+
diff -wpruN --no-dereference '--exclude=*.orig' a~/misc/terminfo.src a/misc/terminfo.src
1111
--- a~/misc/terminfo.src 1970-01-01 00:00:00
1212
+++ a/misc/terminfo.src 1970-01-01 00:00:00
1313
@@ -8245,6 +8245,7 @@ screen-16color-bce-s|GNU Screen with 16

‎build/ncurses/patches/pkg-config.patch

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -wpruN --no-dereference '--exclude=*.orig' a~/misc/gen-pkgconfig.in a/misc/gen-pkgconfig.in
2+
--- a~/misc/gen-pkgconfig.in 1970-01-01 00:00:00
3+
+++ a/misc/gen-pkgconfig.in 1970-01-01 00:00:00
4+
@@ -83,7 +83,7 @@ if [ "$includedir" != "/usr/include" ];
5+
fi
6+
7+
lib_flags=
8+
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
9+
+for opt in -L$libdir -Wl,-R$libdir @EXTRA_PKG_LDFLAGS@ @LIBS@
10+
do
11+
case $opt in
12+
-l*) # LIBS is handled specially below
13+
diff -wpruN --no-dereference '--exclude=*.orig' a~/misc/ncurses-config.in a/misc/ncurses-config.in
14+
--- a~/misc/ncurses-config.in 1970-01-01 00:00:00
15+
+++ a/misc/ncurses-config.in 1970-01-01 00:00:00
16+
@@ -101,7 +101,7 @@ fi
17+
# There is no portable way to find the list of standard library directories.
18+
# Require a POSIX shell anyway, to keep this simple.
19+
lib_flags=
20+
-for opt in -L$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
21+
+for opt in -L$libdir -Wl,-R$libdir @EXTRA_PKG_LDFLAGS@ $LIBS
22+
do
23+
case $opt in
24+
-specs*) # ignore linker specs-files which were used to build library

‎build/ncurses/patches/series

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
xterm-no-rep.patch
22
sun-color.patch
33
drop-rin-from-screen-256color.diff
4+
pkg-config.patch

‎build/ncurses/patches/sun-color.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ to sun-color, and upped the number of supported colours to 256.
55
See: https://www.illumos.org/issues/10359
66
https://www.illumos.org/issues/10360
77

8-
diff -wpruN '--exclude=*.orig' a~/misc/terminfo.src a/misc/terminfo.src
8+
diff -wpruN --no-dereference '--exclude=*.orig' a~/misc/terminfo.src a/misc/terminfo.src
99
--- a~/misc/terminfo.src 1970-01-01 00:00:00
1010
+++ a/misc/terminfo.src 1970-01-01 00:00:00
1111
@@ -8848,9 +8848,9 @@ sun-type4|Sun Workstation console with t

‎build/ncurses/patches/xterm-no-rep.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ the xterm terminal definition in OmniOS.
77

88
See also http://invisible-island.net/ncurses/ncurses.faq.html#xterm_generic
99

10-
diff -wpruN '--exclude=*.orig' a~/misc/terminfo.src a/misc/terminfo.src
10+
diff -wpruN --no-dereference '--exclude=*.orig' a~/misc/terminfo.src a/misc/terminfo.src
1111
--- a~/misc/terminfo.src 1970-01-01 00:00:00
1212
+++ a/misc/terminfo.src 1970-01-01 00:00:00
1313
@@ -4985,14 +4985,14 @@ xterm-xfree86|xterm terminal emulator (X

‎build/python311/local.mog

+2-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ link path=usr/lib/amd64/libpython3.so target=libpython$(PYTHONVER)-stub.so
4343

4444
<transform link mediator=python3 -> set mediator-version $(PYTHONVER)>
4545

46-
# Let the default mediator priority take effect while the highest version is
47-
# the default.
48-
#<transform link mediator=python3 -> set mediator-priority vendor>
46+
# Python 3.11 is currently the default
47+
<transform link mediator=python3 -> set mediator-priority vendor>
4948

5049
# Add mediated link for /usr/bin/python and python-config
5150
link path=usr/bin/python target=python3

‎build/python312/README

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
2+
Python module dependencies
3+
--------------------------
4+
5+
setuptools
6+
pip (and pip depends on setuptools! See "Bootstrap" below)
7+
8+
pkg
9+
cryptography
10+
setuptools-rust
11+
semantic-version
12+
typing-extensions
13+
tomli
14+
six
15+
cffi
16+
pycparser
17+
asn1crypto
18+
idna
19+
jsonrpclib
20+
jsonschema
21+
attrs
22+
pyrsistent
23+
js-regex
24+
orjson
25+
pycurl
26+
rapidjson
27+
coverage
28+
pyopenssl
29+
cryptography
30+
31+
bhyve (brand)
32+
pyyaml
33+
34+
glib2
35+
meson
36+
37+
38+
Bootstrap
39+
---------
40+
41+
To bootstrap modules for a new python version, build 'setuptools' and 'pip'
42+
with the '-f bootstrap' flag, and install these bootstrap packages:
43+
44+
for m in setuptools pip; do
45+
{ cd $m; ./build.sh -f bootstrap -blt; }
46+
done
47+
pfexec pkg install {pip,setuptools}-3XX-bootstrap
48+
49+
then build again, without the bootstrap flag:
50+
51+
for m in setuptools pip; do
52+
{ cd $m; ./build.sh -blt; }
53+
done
54+
55+
and finally switch out the bootstrap packages for the real ones:
56+
57+
pfexec pkg install --reject pip-3XX-bootstrap pip-3XX
58+
pfexec pkg install --reject setuptools-3XX-bootstrap setuptools-3XX
59+

‎build/python312/asn1crypto/build.sh

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#!/usr/bin/bash
2+
#
3+
# {{{ CDDL HEADER
4+
#
5+
# This file and its contents are supplied under the terms of the
6+
# Common Development and Distribution License ("CDDL"), version 1.0.
7+
# You may only use this file in accordance with the terms of version
8+
# 1.0 of the CDDL.
9+
#
10+
# A full copy of the text of the CDDL should have accompanied this
11+
# source. A copy of the CDDL is also available via the Internet at
12+
# http://www.illumos.org/license/CDDL.
13+
# }}}
14+
#
15+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
16+
17+
. ../../../lib/build.sh
18+
19+
PKG=library/python-3/asn1crypto-312
20+
PROG=asn1crypto
21+
inherit_ver python311/asn1crypto
22+
SUMMARY="asn1crypto - Fast ASN.1 parser..."
23+
DESC="$SUMMARY"
24+
25+
. $SRCDIR/../common.sh
26+
27+
BUILD_DEPENDS_IPS+="library/python-$PYMVER/setuptools-$SPYVER"
28+
29+
init
30+
download_source pymodules/$PROG $PROG $VER
31+
patch_source
32+
prep_build
33+
python_build
34+
make_package
35+
clean_up
36+
37+
# Vim hints
38+
# vim:ts=4:sw=4:et:fdm=marker

‎build/python312/asn1crypto/local.mog

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#
2+
# This file and its contents are supplied under the terms of the
3+
# Common Development and Distribution License ("CDDL"), version 1.0.
4+
# You may only use this file in accordance with the terms of version
5+
# 1.0 of the CDDL.
6+
#
7+
# A full copy of the text of the CDDL should have accompanied this
8+
# source. A copy of the CDDL is also available via the Internet at
9+
# http://www.illumos.org/license/CDDL.
10+
11+
# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
12+
13+
license LICENSE license=MIT
14+

‎build/python312/attrs/build.sh

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#!/usr/bin/bash
2+
#
3+
# {{{ CDDL HEADER
4+
#
5+
# This file and its contents are supplied under the terms of the
6+
# Common Development and Distribution License ("CDDL"), version 1.0.
7+
# You may only use this file in accordance with the terms of version
8+
# 1.0 of the CDDL.
9+
#
10+
# A full copy of the text of the CDDL should have accompanied this
11+
# source. A copy of the CDDL is also available via the Internet at
12+
# http://www.illumos.org/license/CDDL.
13+
# }}}
14+
#
15+
# Copyright 2024 OmniOS Community Edition (OmniOSce) Association.
16+
#
17+
. ../../../lib/build.sh
18+
19+
PKG=library/python-3/attrs-312
20+
PROG=attrs
21+
inherit_ver python311/attrs
22+
SUMMARY="Python attrs"
23+
DESC="Classes Without Boilerplate"
24+
25+
. $SRCDIR/../common.sh
26+
27+
init
28+
download_source pymodules/$PROG $PROG $VER
29+
patch_source
30+
prep_build
31+
python_build
32+
make_package
33+
clean_up
34+
35+
# Vim hints
36+
# vim:ts=4:sw=4:et:fdm=marker

‎build/python312/attrs/local.mog

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#
2+
# This file and its contents are supplied under the terms of the
3+
# Common Development and Distribution License ("CDDL"), version 1.0.
4+
# You may only use this file in accordance with the terms of version
5+
# 1.0 of the CDDL.
6+
#
7+
# A full copy of the text of the CDDL should have accompanied this
8+
# source. A copy of the CDDL is also available via the Internet at
9+
# http://www.illumos.org/license/CDDL.
10+
#
11+
12+
# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
13+
14+
license LICENSE license=MIT
15+
16+
<transform file path=usr/bin \
17+
-> edit path usr/bin usr/lib/python$(PYTHONVER)/bin>
18+

0 commit comments

Comments
 (0)