Skip to content

Commit e3ab940

Browse files
MingcongBaiMingcongBai
committed
python-3: add non-library Spiral provides
1 parent 1a0adbd commit e3ab940

File tree

3 files changed

+32
-77
lines changed

3 files changed

+32
-77
lines changed

‎lang-python/python-3/autobuild/defines‎

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PKGNAME=python-3
2-
PKGDES="Python 3 programming language libraries and interpreter"
2+
PKGDES="Python programming language libraries and interpreter (version 3)"
33
PKGSEC=python
44

55
PKGDEP="bzip2 expat gdbm libffi mpdecimal openssl sqlite tk xz zlib libnsl2 ncurses util-linux libtirpc readline"
6-
PKGDEP__RETRO="bzip2 expat gdbm libffi mpdecimal openssl sqlite xz zlib libnsl2"
6+
PKGDEP__RETRO="bzip2 expat gdbm libffi mpdecimal openssl sqlite tk xz zlib libnsl2"
77
PKGDEP__ARMV4="${PKGDEP__RETRO}"
88
PKGDEP__ARMV6HF="${PKGDEP__RETRO}"
99
PKGDEP__ARMV7HF="${PKGDEP__RETRO}"
@@ -28,42 +28,25 @@ BUILDDEP__M68K="${BUILDDEP__RETRO}"
2828
BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
2929
BUILDDEP__PPC64="${BUILDDEP__RETRO}"
3030

31-
AUTOTOOLS_AFTER="--with-computed-gotos \
32-
--with-lto \
33-
--enable-optimizations \
34-
--with-system-expat \
35-
--with-system-libmpdec \
36-
--with-dbmliborder=gdbm:ndbm \
37-
--without-ensurepip \
38-
--enable-loadable-sqlite-extensions \
39-
--enable-shared"
40-
AUTOTOOLS_AFTER__RETRO=" \
41-
--with-threads \
42-
--with-computed-gotos \
43-
--with-lto \
44-
--enable-ipv6 \
45-
--with-system-expat \
46-
--with-system-libmpdec \
47-
--with-dbmliborder=gdbm:ndbm \
48-
--without-ensurepip \
49-
--enable-loadable-sqlite-extensions \
50-
--with-tcltk-includes= \
51-
--with-tcltk-libs= \
52-
--disable-optimizations \
53-
--enable-shared"
54-
AUTOTOOLS_AFTER__ARMV4="${AUTOTOOLS_AFTER__RETRO}"
55-
AUTOTOOLS_AFTER__ARMV6HF="${AUTOTOOLS_AFTER__RETRO}"
56-
AUTOTOOLS_AFTER__ARMV7HF="${AUTOTOOLS_AFTER__RETRO}"
57-
AUTOTOOLS_AFTER__I486="${AUTOTOOLS_AFTER__RETRO}"
58-
AUTOTOOLS_AFTER__LOONGSON2F="${AUTOTOOLS_AFTER__RETRO}"
59-
AUTOTOOLS_AFTER__M68K="${AUTOTOOLS_AFTER__RETRO}"
60-
AUTOTOOLS_AFTER__POWERPC="${AUTOTOOLS_AFTER__RETRO}"
61-
AUTOTOOLS_AFTER__PPC64="${AUTOTOOLS_AFTER__RETRO}"
31+
# Note: Extra Provides for Spiral.
32+
PKGPROV="idle_spiral libpython3-all-dev_spiral libpython3-stdlib_spiral \
33+
python3-all_spiral python3-all-dev_spiral python3-dev_spiral \
34+
python3-full_spiral python3-gdbm_spiral python3-minimal_spiral \
35+
python3-tk_spiral python3_spiral python3.14_spiral"
6236

63-
ABSHADOW=0
64-
AB_FLAGS_O3=1
37+
AUTOTOOLS_AFTER=(
38+
'--with-computed-gotos'
39+
'--with-lto'
40+
'--enable-optimizations'
41+
'--with-system-expat'
42+
'--with-system-libmpdec'
43+
'--with-dbmliborder=gdbm:ndbm'
44+
'--without-ensurepip'
45+
'--enable-loadable-sqlite-extensions'
46+
'--enable-shared'
47+
)
6548

66-
NOLTO__ARMV7HF=1
49+
AB_FLAGS_O3=1
6750

6851
PKGREP="python-3.5<=3.5.1"
6952
PKGBREAK="acbs<=2:20251231 accerciser<=3.40.0-1 acme<=5.1.0 \
@@ -395,6 +378,3 @@ PKGBREAK="acbs<=2:20251231 accerciser<=3.40.0-1 acme<=5.1.0 \
395378
zipp<=3.23.0 znc<=1.10.1-1 zope-component<=4.4.1-5 zope-event<=4.3.0-5 \
396379
zope-interface<=7.2-2 zotero<=7.0.30 zstandard<=0.23.0 \
397380
zulip-desktop<=5.12.3"
398-
399-
# Note: Alternative names for Spiral/convenience.
400-
PKGPROV="python3_spiral python3.14_spiral"

‎lang-python/python-3/autobuild/defines.stage2‎

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKGNAME=python-3
2-
PKGDES="Python 3 programming language libraries and interpreter"
2+
PKGDES="Python programming language libraries and interpreter (version 3)"
33
PKGSEC=python
44

55
PKGDEP="bzip2 expat gdbm libffi mpdecimal openssl sqlite xz zlib libnsl2"
@@ -12,45 +12,19 @@ PKGDEP__POWERPC="${PKGDEP__RETRO}"
1212
PKGDEP__PPC64="${PKGDEP__RETRO}"
1313

1414
BUILDDEP=""
15-
BUILDDEP__ARMV4="${BUILDDEP__RETRO}"
16-
BUILDDEP__ARMV6HF="${BUILDDEP__RETRO}"
17-
BUILDDEP__ARMV7HF="${BUILDDEP__RETRO}"
18-
BUILDDEP__I486="${BUILDDEP__RETRO}"
19-
BUILDDEP__LOONGSON2F="${BUILDDEP__RETRO}"
20-
BUILDDEP__POWERPC="${BUILDDEP__RETRO}"
21-
BUILDDEP__PPC64="${BUILDDEP__RETRO}"
2215

23-
AUTOTOOLS_AFTER="--with-computed-gotos \
24-
--with-lto \
25-
--enable-optimizations \
26-
--with-system-expat \
27-
--with-system-libmpdec \
28-
--with-dbmliborder=gdbm:ndbm \
29-
--without-ensurepip \
30-
--enable-loadable-sqlite-extensions \
31-
--enable-shared"
32-
AUTOTOOLS_AFTER__RETRO=" \
33-
--with-computed-gotos \
34-
--with-lto \
35-
--enable-ipv6 \
36-
--with-system-expat \
37-
--with-system-libmpdec \
38-
--with-dbmliborder=gdbm:ndbm \
39-
--without-ensurepip \
40-
--enable-loadable-sqlite-extensions \
41-
--with-tcltk-includes= \
42-
--with-tcltk-libs= \
43-
--disable-optimizations \
44-
--enable-shared"
45-
AUTOTOOLS_AFTER__ARMV4="${AUTOTOOLS_AFTER__RETRO}"
46-
AUTOTOOLS_AFTER__ARMV6HF="${AUTOTOOLS_AFTER__RETRO}"
47-
AUTOTOOLS_AFTER__ARMV7HF="${AUTOTOOLS_AFTER__RETRO}"
48-
AUTOTOOLS_AFTER__I486="${AUTOTOOLS_AFTER__RETRO}"
49-
AUTOTOOLS_AFTER__LOONGSON2F="${AUTOTOOLS_AFTER__RETRO}"
50-
AUTOTOOLS_AFTER__POWERPC="${AUTOTOOLS_AFTER__RETRO}"
51-
AUTOTOOLS_AFTER__PPC64="${AUTOTOOLS_AFTER__RETRO}"
16+
AUTOTOOLS_AFTER=(
17+
'--with-computed-gotos'
18+
'--with-lto'
19+
'--enable-optimizations'
20+
'--with-system-expat'
21+
'--with-system-libmpdec'
22+
'--with-dbmliborder=gdbm:ndbm'
23+
'--without-ensurepip'
24+
'--enable-loadable-sqlite-extensions'
25+
'--enable-shared'
26+
)
5227

53-
ABSHADOW=0
5428
AB_FLAGS_O3=1
5529

5630
# FIXME: Fails for some reason during stage2.

‎lang-python/python-3/spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
VER=3.14.3
2+
REL=1
23
SRCS="tbl::https://www.python.org/ftp/python/${VER/~*/}/Python-${VER/\~/}.tar.xz"
34
CHKSUMS="sha256::a97d5549e9ad81fe17159ed02c68774ad5d266c72f8d9a0b5a9c371fe85d902b"
45
CHKUPDATE="anitya::id=13254"

0 commit comments

Comments
 (0)