diff --git a/common/shlibs b/common/shlibs index f94a891d6fd..f77a133b4ed 100644 --- a/common/shlibs +++ b/common/shlibs @@ -735,6 +735,7 @@ libasm.so.1 libelf-0.155_1 libdebuginfod.so.1 libdebuginfod-0.182_1 libgtksourceview-3.0.so.1 gtksourceview-3.8.0_1 libtalloc.so.2 talloc-2.0.1_1 +libpytalloc-util.so.2 libpytalloc-util-2.3.1_2 libmount.so.1 libmount-2.18_1 libdconf.so.1 dconf-0.13.90_1 libassuan.so.0 libassuan-2.0.1_1 diff --git a/srcpkgs/libpytalloc-util b/srcpkgs/libpytalloc-util new file mode 120000 index 00000000000..e5668c8aed6 --- /dev/null +++ b/srcpkgs/libpytalloc-util @@ -0,0 +1 @@ +talloc \ No newline at end of file diff --git a/srcpkgs/talloc-python3 b/srcpkgs/talloc-python3 new file mode 120000 index 00000000000..e5668c8aed6 --- /dev/null +++ b/srcpkgs/talloc-python3 @@ -0,0 +1 @@ +talloc \ No newline at end of file diff --git a/srcpkgs/talloc/files/cross-32bit.answers b/srcpkgs/talloc/files/cross-32bit.answers deleted file mode 100644 index 4223ff00679..00000000000 --- a/srcpkgs/talloc/files/cross-32bit.answers +++ /dev/null @@ -1,47 +0,0 @@ -Checking uname sysname type: "Linux" -Checking uname machine type: "dontcare" -Checking uname release type: "dontcare" -Checking uname version type: "dontcare" -Checking simple C program: OK -Checking for -D_LARGE_FILES: OK -building library support: OK -Checking for large file support: OK -Checking for -D_FILE_OFFSET_BITS=64: OK -Checking for WORDS_BIGENDIAN: OK -Checking size of char: "1" -Checking size of int: "4" -Checking size of long long: "4" -Checking size of long: "4" -Checking size of off_t: "4" -Checking size of short: "2" -Checking size of size_t: "4" -Checking size of ssize_t: "4" -Checking size of dev_t: "4" -Checking size of ino_t: "4" -Checking size of time_t: "4" -Checking size of void*: "4" -Checking for C99 vsnprintf: OK -Checking for HAVE_SECURE_MKSTEMP: OK -rpath library support: OK --Wl,--version-script support: OK -Checking size of bool: "1" -Checking size of int8_t: "1" -Checking size of uint8_t: "1" -Checking size of int16_t: "2" -Checking size of uint16_t: "2" -Checking size of int32_t: "4" -Checking size of uint32_t: "4" -Checking size of int64_t: "4" -Checking size of uint64_t: "4" -Checking correct behavior of strtoll: OK -Checking correct behavior of strptime: OK -Checking for HAVE_IFACE_GETIFADDRS: OK -Checking for HAVE_IFACE_IFCONF: OK -Checking for HAVE_IFACE_IFREQ: OK -Checking getconf LFS_CFLAGS: "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" -Checking for large file support without additional flags: OK -Checking for working strptime: OK -Checking for HAVE_SHARED_MMAP: OK -Checking for HAVE_MREMAP: OK -Checking for HAVE_INCOHERENT_MMAP: NO -Checking getconf large file support flags work: OK diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index a07179ee871..50f629f3db7 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -1,9 +1,15 @@ # Template file for 'talloc' pkgname=talloc version=2.3.1 -revision=1 -build_style=configure -hostmakedepends="pkg-config python3 libxslt docbook-xsl which" +revision=2 +build_style=waf3 +build_helper="qemu" +configure_script="buildtools/bin/waf" +configure_args="--sysconfdir=/etc --localstatedir=/var + --disable-rpath --disable-rpath-install --without-gettext + --builtin-libraries=replace --bundled-libraries=NONE" +hostmakedepends="pkg-config docbook2x" +makedepends="python3-devel libtirpc-devel libxslt gettext-devel" short_desc="Hierarchical pool based memory allocator with destructors" maintainer="Orphaned " license="GPL-3.0-or-later" @@ -11,22 +17,36 @@ homepage="https://talloc.samba.org/" distfiles="http://samba.org/ftp/${pkgname}/${pkgname}-${version}.tar.gz" checksum=ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77 -do_configure() { - if [ "$CROSS_BUILD" ]; then - cp "$FILESDIR"/cross-32bit.answers . - _args+=" --cross-compile --hostcc=${CC} --cross-answers=cross-32bit.answers" - fi +export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" - ./configure --prefix=/usr --disable-python ${_args} +post_patch() { + # Avoid Python shlib extension noise in libpytallic-util.so + vsed -e "/env.pyext_PATTERN/s/dct\['SO'\]/'.so'/" \ + -i third_party/waf/waflib/Tools/python.py +} + +talloc-python3_package() { + short_desc+=" - Python3 bindings" + pkg_install() { + vmove ${py3_lib} + } +} + +libpytalloc-util_package() { + short_desc+=" - Python3 utility library" + pkg_install() { + vmove "usr/lib/libpytalloc-util.so.*" + } } talloc-devel_package() { - depends="${sourcepkg}-${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision} + libpytalloc-util>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/libtalloc.so + vmove "usr/lib/*.so" vmove usr/share/man/man3 } }