From 1d97f0235cbe54056ffd64dd6cc4ccf3927b5de2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Tue, 24 Sep 2019 22:45:09 +0200 Subject: [PATCH] bcal: fix build; adopt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jürgen Buchmüller --- srcpkgs/bcal/patches/non-null.patch | 11 +++++++++++ srcpkgs/bcal/template | 11 +++++------ 2 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/bcal/patches/non-null.patch diff --git a/srcpkgs/bcal/patches/non-null.patch b/srcpkgs/bcal/patches/non-null.patch new file mode 100644 index 00000000000..132fc086784 --- /dev/null +++ b/srcpkgs/bcal/patches/non-null.patch @@ -0,0 +1,11 @@ +--- src/bcal.c 2018-12-11 16:12:41.000000000 +0100 ++++ src/bcal.c 2019-09-24 22:34:39.475836973 +0200 +@@ -1923,7 +1923,7 @@ + char *expr = fixexpr(exp, &ret); /* Make parsing compatible */ + char *ptr; + +- log(DEBUG, "expr: %s\n", expr); ++ log(DEBUG, "expr: %s\n", expr ? expr : ""); + + if (expr == NULL) { + if (ret) diff --git a/srcpkgs/bcal/template b/srcpkgs/bcal/template index d89f55ff5b7..905e22fccd5 100644 --- a/srcpkgs/bcal/template +++ b/srcpkgs/bcal/template @@ -1,18 +1,17 @@ # Template file for 'bcal' pkgname=bcal version=2.1 -revision=2 +revision=3 build_style=gnu-makefile makedepends="readline-devel" depends="bc" short_desc="Byte CALculator for storage conversions and calculations" -maintainer="Orphaned " +maintainer="Jürgen Buchmüller " license="GPL-3.0-or-later" homepage="https://github.com/jarun/bcal" distfiles="https://github.com/jarun/bcal/archive/v${version}.tar.gz" checksum=c0b6cb911a773abdd555e6a9e0eb8a25934ceca038156e6250e117fa451beaa6 -nocross=yes -case "$XBPS_TARGET_MACHINE" in - i686*) broken="https://build.voidlinux.org/builders/i686_builder/builds/6760/steps/shell_3/logs/stdio";; -esac +if [ "$XBPS_TARGET_WORDSIZE" -ne 64 ]; then + broken="Can only be built for 64 bit targets which define __uint128_t." +fi