From 7aac13af051ec73bccc2f35740204827d862bf00 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Aug 2022 15:20:13 -0400 Subject: [PATCH] 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 c4625ea2c74..3801747eb95 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() {