From 2ac00d58c9c29c42dc2c31757b5aaa668b25899a Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 1 Jan 2020 22:32:59 -0600 Subject: [PATCH 1/2] talloc: update to 2.3.1 Signed-off-by: Nathan Owens --- srcpkgs/talloc/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index cd881524fe9e84..d42586a612d294 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -1,21 +1,22 @@ # Template file for 'talloc' pkgname=talloc -version=2.1.14 +version=2.3.1 revision=1 build_style=configure -hostmakedepends="pkg-config python libxslt docbook-xsl" +hostmakedepends="pkg-config python3 libxslt docbook-xsl" short_desc="Hierarchical pool based memory allocator with destructors" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://talloc.samba.org/" distfiles="http://samba.org/ftp/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=b185602756a628bac507fa8af8b9df92ace69d27c0add5dab93190ad7c3367ce +checksum=ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77 do_configure() { if [ "$CROSS_BUILD" ]; then - cp ${FILESDIR}/cross-32bit.answers . - _args="--cross-compile --hostcc=cc --cross-answers=cross-32bit.answers" + cp "$FILESDIR"/cross-32bit.answers . + _args+=" --cross-compile --hostcc=${CC} --cross-answers=cross-32bit.answers" fi + ./configure --prefix=/usr --disable-python ${_args} } From c23b5e12bf1b067590303a817bcff6553648e058 Mon Sep 17 00:00:00 2001 From: Nathan Owens Date: Wed, 1 Jan 2020 22:33:46 -0600 Subject: [PATCH 2/2] tevent: update to 0.10.2 ; fix cross-build Signed-off-by: Nathan Owens --- srcpkgs/tevent/files/cross-32bit.answers | 51 ++++++++++++++++++++++++ srcpkgs/tevent/template | 25 ++++++++---- 2 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/tevent/files/cross-32bit.answers diff --git a/srcpkgs/tevent/files/cross-32bit.answers b/srcpkgs/tevent/files/cross-32bit.answers new file mode 100644 index 00000000000000..dbfe963257a2c5 --- /dev/null +++ b/srcpkgs/tevent/files/cross-32bit.answers @@ -0,0 +1,51 @@ +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 +Checking value of NSIG: 64 +Checking value of _NSIG: 64 +Checking value of SIGRTMAX: 32 +Checking value of SIGRTMIN: 32 diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template index b5d4ab8f2a6296..3c216422f2752b 100644 --- a/srcpkgs/tevent/template +++ b/srcpkgs/tevent/template @@ -1,18 +1,29 @@ # Template file for 'tevent' pkgname=tevent -version=0.9.37 -revision=2 -build_style=gnu-configure -hostmakedepends="python pkg-config" +version=0.10.2 +revision=1 +build_style=configure +hostmakedepends="python3 pkg-config" makedepends="talloc-devel libtirpc-devel" short_desc="Event system based on the talloc memory management library" maintainer="Yuusha Spacewolf " license="GPL-3.0-or-later" homepage="https://tevent.samba.org" -distfiles="https://www.samba.org/ftp/tevent/tevent-${version}.tar.gz" -checksum=168345ed65eac03785cf77b95238e7dc66cbb473a42811693a6b0916e5dae7e0 +distfiles="https://ftp.samba.org/pub/tevent/tevent-${version}.tar.gz" +checksum=f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696 -nocross="see srcpkgs/tdb (cross-32bit.answers)" +do_configure() { + case "XBPS_TARGET_WORDSIZE" in + 32) vsed -e '/NSIG/s,64,32,' -e '/_NSIG/s,64,32,' -i "$FILESDIR"/cross-32bit.answers + esac + + if [ "$CROSS_BUILD" ]; then + cp "$FILESDIR"/cross-32bit.answers . + _args="${configure_args} --cross-compile --hostcc=${CC} --cross-answers=cross-32bit.answers" + fi + + ./configure --prefix=/usr --disable-python ${_args} +} tevent-devel_package() { short_desc+=" - development files"