* [PR PATCH] common: remove unused python-module build style
@ 2023-06-17 19:22 paper42
2023-06-18 18:24 ` [PR PATCH] [Merged]: " paper42
0 siblings, 1 reply; 2+ messages in thread
From: paper42 @ 2023-06-17 19:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 483 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages remove-python-module
https://github.com/void-linux/void-packages/pull/44495
common: remove unused python-module build style
python-module build style is now unused, all projects that want to have a python2 and a python3 package should be split to two templates
A patch file from https://github.com/void-linux/void-packages/pull/44495.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-python-module-44495.patch --]
[-- Type: text/x-diff, Size: 5367 bytes --]
From f9565ede3bc3a97cdccbe7a6bf3df9f34bd48872 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Sat, 17 Jun 2023 21:20:54 +0200
Subject: [PATCH] common: remove unused python-module build style
python-module build style is now unused, all projects that want to have
a python2 and a python3 package should be split to two templates
---
Manual.md | 8 +-
common/build-style/python-module.sh | 96 -------------------
.../environment/build-style/python-module.sh | 2 -
3 files changed, 3 insertions(+), 103 deletions(-)
delete mode 100644 common/build-style/python-module.sh
delete mode 100644 common/environment/build-style/python-module.sh
diff --git a/Manual.md b/Manual.md
index 0b6b5ab645fc..1670863cbe54 100644
--- a/Manual.md
+++ b/Manual.md
@@ -995,13 +995,11 @@ system. Additional arguments may be passed to the `zig build` invocation using
For packages that use the Python module build method (`setup.py` or
[PEP 517](https://www.python.org/dev/peps/pep-0517/)), you can choose one of the following:
-- `python-module` to build *both* Python 2.x and 3.x modules
+- `python2-module` to build Python 2.x modules
-- `python2-module` to build Python 2.x only modules
+- `python3-module` to build Python 3.x modules
-- `python3-module` to build Python 3.x only modules
-
-- `python3-pep517` to build Python 3.x only modules that provide a PEP 517 build description without
+- `python3-pep517` to build Python 3.x modules that provide a PEP 517 build description without
a `setup.py` script
Environment variables for a specific `build_style` can be declared in a filename
diff --git a/common/build-style/python-module.sh b/common/build-style/python-module.sh
deleted file mode 100644
index b80801a67247..000000000000
--- a/common/build-style/python-module.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#
-# This helper is for templates installing python modules.
-#
-
-do_build() {
- : ${python_versions:="2.7 $py3_ver"}
- local pyver= tmp_cflags="$CFLAGS" tmp_ldflags="$LDFLAGS"
-
- for pyver in $python_versions; do
- if [ -n "$CROSS_BUILD" ]; then
- CFLAGS="$tmp_cflags"
- LDFLAGS="$tmp_ldflags"
- ADDENV=
-
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- case $pyver in
- 3.*)
- for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
- f=${f##*/}
- _PYTHON_SYSCONFIGDATA_NAME=${f%.py}
- done
- ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}"
- ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME""
- esac
- env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python${pyver} setup.py \
- build --build-base=build-${pyver} ${make_build_args}
- else
- python${pyver} setup.py build --build-base=build-${pyver} ${make_build_args}
- fi
- done
-}
-
-do_check() {
- : ${python_versions:="2.7 $py3_ver"}
-
- for pyver in $python_versions; do
- ln -s build-${pyver} build
- if [ -z "$make_check_target" ]; then
- if ! python${pyver} setup.py --help test >/dev/null 2>&1; then
- msg_warn "No command 'test' defined by setup.py for python${pyver}.\n"
- rm build
- return 0
- fi
- fi
-
- ${make_check_pre} python${pyver} setup.py ${make_check_target:-test} ${make_check_args}
- rm build
- done
-}
-
-do_install() {
- : ${python_versions:="2.7 $py3_ver"}
- local pyver=
-
- for pyver in $python_versions; do
- if [ -n "$CROSS_BUILD" ]; then
- ADDENV=
- PYPREFIX="$XBPS_CROSS_BASE"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/include/python${pyver} -I${XBPS_CROSS_BASE}/usr/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/lib/python${pyver} -L${XBPS_CROSS_BASE}/usr/lib"
- CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS"
- LDSHARED="${CC} -shared $LDFLAGS"
- case $pyver in
- 3.*)
- for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do
- f=${f##*/}
- _PYTHON_SYSCONFIGDATA_NAME=${f%.py}
- done
- ADDENV+=" PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib}"
- ADDENV+=" _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME""
- esac
- env CC="$CC" LDSHARED="$LDSHARED" $ADDENV \
- PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \
- LDFLAGS="$LDFLAGS" python${pyver} setup.py \
- build --build-base=build-${pyver} \
- install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- else
- python${pyver} setup.py build --build-base=build-${pyver} \
- install --prefix=/usr --root=${DESTDIR} ${make_install_args}
- fi
-
- # Rename unversioned scripts to avoid name conflicts.
- if [ -d ${DESTDIR}/usr/bin ]; then
- find ${DESTDIR}/usr/bin -type f ! -name "*[[:digit:]]" | while IFS= read -r f _; do
- mv "${f}" "${f}${pyver%.*}"
- echo "[python-module] Unversioned script renamed to '${f#$DESTDIR}${pyver%.*}'"
- done
- fi
- done
-}
diff --git a/common/environment/build-style/python-module.sh b/common/environment/build-style/python-module.sh
deleted file mode 100644
index d6b6502e44fd..000000000000
--- a/common/environment/build-style/python-module.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-lib32disabled=yes
-makedepends+=" python python3"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: common: remove unused python-module build style
2023-06-17 19:22 [PR PATCH] common: remove unused python-module build style paper42
@ 2023-06-18 18:24 ` paper42
0 siblings, 0 replies; 2+ messages in thread
From: paper42 @ 2023-06-18 18:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
There's a merged pull request on the void-packages repository
common: remove unused python-module build style
https://github.com/void-linux/void-packages/pull/44495
Description:
python-module build style is now unused, all projects that want to have a python2 and a python3 package should be split to two templates
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-18 18:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-17 19:22 [PR PATCH] common: remove unused python-module build style paper42
2023-06-18 18:24 ` [PR PATCH] [Merged]: " paper42
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).