From 61644bf1b2cec45a79945964ad14ef3f13a6c394 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:18:02 -0400 Subject: [PATCH 1/7] common/build-helper/python3.sh: add python3 helper --- common/build-helper/python3.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 common/build-helper/python3.sh diff --git a/common/build-helper/python3.sh b/common/build-helper/python3.sh new file mode 100644 index 000000000000..3e16755ea483 --- /dev/null +++ b/common/build-helper/python3.sh @@ -0,0 +1,14 @@ +# fix building non-pure-python modules on cross +if [ -n "$CROSS_BUILD" ]; then + export PYPREFIX="$XBPS_CROSS_BASE" + export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" + export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" + export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" + export LDSHARED="${CC} -shared $LDFLAGS" + export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}" + for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do + f=${f##*/} + _PYTHON_SYSCONFIGDATA_NAME=${f%.py} + done + export _PYTHON_SYSCONFIGDATA_NAME +fi From 10c64574ee638a51aeb9157818ec413a146822b7 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:19:03 -0400 Subject: [PATCH 2/7] common/{,environment}/build_style/python3.sh: use python3 build_helper --- common/build-style/python3-module.sh | 39 +------------------ .../environment/build-style/python3-module.sh | 1 + 2 files changed, 3 insertions(+), 37 deletions(-) diff --git a/common/build-style/python3-module.sh b/common/build-style/python3-module.sh index a0a694ee4a97..b76d89c8b502 100644 --- a/common/build-style/python3-module.sh +++ b/common/build-style/python3-module.sh @@ -3,24 +3,7 @@ # do_build() { - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args} - else - python3 setup.py build ${make_build_args} - fi + python3 setup.py build ${make_build_args} } do_check() { @@ -47,23 +30,5 @@ do_check() { } do_install() { - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py \ - install --prefix=/usr --root=${DESTDIR} ${make_install_args} - else - python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} - fi + python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} } diff --git a/common/environment/build-style/python3-module.sh b/common/environment/build-style/python3-module.sh index 56471fe88bc0..638f6be9373a 100644 --- a/common/environment/build-style/python3-module.sh +++ b/common/environment/build-style/python3-module.sh @@ -1,2 +1,3 @@ lib32disabled=yes makedepends+=" python3" +build_helper+=" python3" From fd23072d7cd4767dc4f20a738b24797a0f3d7224 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:10 -0400 Subject: [PATCH 3/7] brltty: use python3 build_helper, clean up --- srcpkgs/brltty/template | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template index 08707f8dc86c..cf7c198b5253 100644 --- a/srcpkgs/brltty/template +++ b/srcpkgs/brltty/template @@ -1,8 +1,9 @@ # Template file for 'brltty' pkgname=brltty version=6.4 -revision=5 +revision=6 build_style=gnu-configure +build_helper=python3 configure_args="--enable-gpm --with-screen-driver=lx,sc --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3" hostmakedepends="pkg-config python3-Cython" @@ -10,8 +11,8 @@ makedepends="ncurses-devel alsa-lib-devel gpm-devel icu-devel python3-devel libb short_desc="Braille display driver for Linux/Unix" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="http://mielke.cc/brltty/" -distfiles="http://mielke.cc/brltty/archive/brltty-${version}.tar.xz" +homepage="https://brltty.app" +distfiles="https://brltty.app/archive/brltty-${version}.tar.xz" checksum=bc7573b0d0ab865c36607945b64c209312405571788f3b409397726f6143eaa6 python_version=3 @@ -25,8 +26,8 @@ esac pre_configure() { case "$XBPS_TARGET_MACHINE" in - *-musl) # There is no ldconfig in musl libc - sed -e "s;/sbin/ldconfig -n;echo;" -i configure + *-musl) # There is no ldconfig in musl libc + sed -e "s;/sbin/ldconfig -n;echo;" -i configure ;; esac export PYTHON_LIBS="-L${XBPS_CROSS_BASE}/usr/lib -lpython${py3_ver}${py3_abiver}" export PYTHON_CPPFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" @@ -34,31 +35,17 @@ pre_configure() { post_configure() { case "$XBPS_TARGET_MACHINE" in - arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" - sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" + arm*-musl) # Fix erroneously detected "#define HAVE_SYS_IO_H 1" + sed -i config.h -e"s;#define HAVE_SYS_IO_H 1;#undef HAVE_SYS_IO_H;" ;; esac } -pre_build() { - if [ "$CROSS_BUILD" ]; then - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} - fi -} - -pre_install() { - pre_build -} - do_install() { make INSTALL_ROOT=${DESTDIR} install - vsv $pkgname + vsv brltty vsconf Documents/brltty.conf vdoc Documents/ChangeLog - vcopy Documents/Manual-BRLTTY usr/share/doc/${pkgname} + vcopy Documents/Manual-BRLTTY usr/share/doc/brltty } brltty-devel_package() { From 5fde1615b98e75fab0b96eb6be834be9a558eec2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:12 -0400 Subject: [PATCH 4/7] i2c-tools: use python3 build_helper --- srcpkgs/i2c-tools/template | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/srcpkgs/i2c-tools/template b/srcpkgs/i2c-tools/template index ec522fd6f71b..1f0b2bcd1f6b 100644 --- a/srcpkgs/i2c-tools/template +++ b/srcpkgs/i2c-tools/template @@ -1,8 +1,9 @@ # Template file for 'i2c-tools' pkgname=i2c-tools version=4.3 -revision=2 +revision=3 build_style=gnu-makefile +build_helper=python3 make_build_args="EXTRA=py-smbus" make_install_args="sbindir=/usr/bin EXTRA=py-smbus" hostmakedepends="python3 python3-setuptools" @@ -16,21 +17,6 @@ distfiles="https://mirrors.edge.kernel.org/pub/software/utils/i2c-tools/i2c-tool checksum=1f899e43603184fac32f34d72498fc737952dbc9c97a8dd9467fadfdf4600cf9 system_groups="i2c" - -if [ -n "$CROSS_BUILD" ]; then - export PYPREFIX="$XBPS_CROSS_BASE" - export CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - export LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - export CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - export LDSHARED="${CC} -shared $LDFLAGS" - export PYTHONPATH="${XBPS_CROSS_BASE}/${py3_lib}" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export _PYTHON_SYSCONFIGDATA_NAME -fi - post_install() { vinstall "${FILESDIR}/45-i2c-tools.rules" 644 usr/lib/udev/rules.d } From 023a4fee139320c872ea591727f938a06b69a5cf Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:13 -0400 Subject: [PATCH 5/7] libpwquality: use python3 build_helper --- srcpkgs/libpwquality/template | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/srcpkgs/libpwquality/template b/srcpkgs/libpwquality/template index 9d72a5539baa..e89a8a0c5cf7 100644 --- a/srcpkgs/libpwquality/template +++ b/srcpkgs/libpwquality/template @@ -1,10 +1,11 @@ # Template file for 'libpwquality' pkgname=libpwquality version=1.4.2 -revision=5 +revision=6 build_style=gnu-configure +build_helper=python3 configure_args="--disable-static --enable-pam --with-securedir=/usr/lib/security" -hostmakedepends="libtool automake gettext-devel python3-devel" +hostmakedepends="libtool automake gettext-devel python3" makedepends="cracklib-devel pam-devel python3-devel" depends="cracklib" conf_files="/etc/security/pwquality.conf" @@ -13,29 +14,13 @@ maintainer="bra1nwave " license="GPL-2.0-or-later" homepage="https://github.com/libpwquality/libpwquality" changelog="https://raw.githubusercontent.com/libpwquality/libpwquality/master/NEWS" -distfiles="${homepage}/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" +distfiles="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-${version}/libpwquality-${version}.tar.bz2" checksum=5263e09ee62269c092f790ac159112aed3e66826a795e3afec85fdeac4281c8e -CFLAGS="-I${XBPS_CROSS_BASE}/${py3_inc}" - pre_configure() { - vsed -i python/Makefile.am -e 's|CFLAGS=.*|LDSHARED="${CC} -pthread -shared" &|g' autoreconf -fi } -pre_build() { - if [ "$CROSS_BUILD" ]; then - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - export _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - export PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} - fi -} -pre_install() { - pre_build -} - libpwquality-devel_package() { depends="cracklib-devel ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" From ce23827589df954d7310e83fbc6425355c7eeb70 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:13 -0400 Subject: [PATCH 6/7] tlsh: use python3 build_helper --- srcpkgs/tlsh/template | 42 ++++-------------------------------------- 1 file changed, 4 insertions(+), 38 deletions(-) diff --git a/srcpkgs/tlsh/template b/srcpkgs/tlsh/template index c4625ea2c74d..3801747eb959 100644 --- a/srcpkgs/tlsh/template +++ b/srcpkgs/tlsh/template @@ -1,8 +1,9 @@ # Template file for 'tlsh' pkgname=tlsh version=3.19.1 -revision=3 +revision=4 build_style=cmake +build_helper=python3 hostmakedepends="python3" makedepends="python3-devel" short_desc="Fuzzy matching library" @@ -19,24 +20,7 @@ pre_configure() { post_build() { cd py_ext - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py build ${make_build_args} - else - python3 setup.py build ${make_build_args} - fi + python3 setup.py build ${make_build_args} } @@ -47,25 +31,7 @@ pre_check() { post_install() { vlicense LICENSE cd py_ext - if [ -n "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - CFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc} -I${XBPS_CROSS_BASE}/usr/include" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - for f in ${XBPS_CROSS_BASE}/${py3_lib}/_sysconfigdata_*; do - f=${f##*/} - _PYTHON_SYSCONFIGDATA_NAME=${f%.py} - done - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHONPATH=${XBPS_CROSS_BASE}/${py3_lib} \ - _PYTHON_SYSCONFIGDATA_NAME="$_PYTHON_SYSCONFIGDATA_NAME" \ - LDFLAGS="$LDFLAGS" python3 setup.py \ - install --prefix=/usr --root=${DESTDIR} ${make_install_args} - else - python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} - fi + python3 setup.py install --prefix=/usr --root=${DESTDIR} ${make_install_args} } tlsh-devel_package() { From db5922cf1e34a31d45fa2c620c6963d8f578b119 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:14 -0400 Subject: [PATCH 7/7] wxPython4: use python3 build_helper --- srcpkgs/wxPython4/template | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/srcpkgs/wxPython4/template b/srcpkgs/wxPython4/template index 554174105a36..6e2b7f10269f 100644 --- a/srcpkgs/wxPython4/template +++ b/srcpkgs/wxPython4/template @@ -1,9 +1,10 @@ # Template file for 'wxPython4' pkgname=wxPython4 version=4.0.7 -revision=4 +revision=5 wrksrc="wxPython-${version}" build_style=python3-module +build_helper=python3 make_build_args="--skip-build" make_install_args="--skip-build" hostmakedepends="pkg-config python3-setuptools python3-pathlib2" @@ -23,18 +24,7 @@ fi pre_build() { chmod -R go+rX $wrksrc - if [ "$CROSS_BUILD" ]; then - PYPREFIX="$XBPS_CROSS_BASE" - LDFLAGS+=" -L${XBPS_CROSS_BASE}/${py3_lib} -L${XBPS_CROSS_BASE}/usr/lib" - CC="${XBPS_CROSS_TRIPLET}-gcc -pthread $CFLAGS $LDFLAGS" - LDSHARED="${CC} -shared $LDFLAGS" - env CC="$CC" LDSHARED="$LDSHARED" \ - PYPREFIX="$PYPREFIX" CFLAGS="$CFLAGS" \ - PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" \ - LDFLAGS="$LDFLAGS" python3 build.py build_py --use_syswx - else - python3 build.py build_py --use_syswx - fi + python3 build.py build_py --use_syswx } post_install() {