diff --git a/srcpkgs/kyua/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch b/srcpkgs/kyua/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch deleted file mode 100644 index 17fc6adfa13..00000000000 --- a/srcpkgs/kyua/patches/0001-Cache-configure-result-of-getcwd-NULL-0-test.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d02bdfc32e748d3763d639cf291bffff4b121df2 Mon Sep 17 00:00:00 2001 -From: Juan RP -Date: Sun, 3 Nov 2013 08:50:03 +0100 -Subject: [PATCH] Cache configure result of getcwd(NULL,0) test. - -This is the last configure test that must be cached for a proper -cross compilation. ---- - configure.ac | 22 +++++++++++++--------- - 1 file changed, 13 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 3ce8e8e..fbe6c57 100644 ---- configure.ac -+++ configure.ac -@@ -58,16 +58,20 @@ KYUA_MEMORY - AC_CHECK_FUNCS([putenv setenv unsetenv]) - - --AC_MSG_CHECKING([whether getcwd(NULL, 0) works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([#include -+AC_CACHE_CHECK( -+ [whether getcwd(NULL, 0) works], -+ [kyua_cv_getcwd_null_0_works], [ -+ AC_RUN_IFELSE([AC_LANG_PROGRAM([#include - #include ], -- [char *cwd = getcwd(NULL, 0); -- return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], -- [AC_MSG_RESULT(yes) -- AC_DEFINE([HAVE_GETCWD_DYN], [1], -- [Define to 1 if getcwd(NULL, 0) works])], -- [AC_MSG_RESULT(no)]) -- -+ [char *cwd = getcwd(NULL, 0); -+ return (cwd != NULL) ? EXIT_SUCCESS : EXIT_FAILURE;])], -+ [kyua_cv_getcwd_null_0_works=yes], -+ [kyua_cv_getcwd_null_0_works=no]) -+]) -+if test "${kyua_cv_getcwd_null_0_works}" = yes; then -+ AC_DEFINE([HAVE_GETCWD_DYN], [1], -+ [Define to 1 if getcwd(NULL, 0) works]) -+fi - - AC_PROG_RANLIB - --- -1.8.4.1 - diff --git a/srcpkgs/kyua/template b/srcpkgs/kyua/template index dd7568e8890..0223adc39fd 100644 --- a/srcpkgs/kyua/template +++ b/srcpkgs/kyua/template @@ -1,24 +1,24 @@ # Template file for 'kyua' pkgname=kyua -version=0.10 -revision=2 +version=0.11 +revision=1 wrksrc="kyua-kyua-${version}" build_style=gnu-configure configure_args=" kyua_cv_attribute_noreturn=yes kyua_cv_lchmod_works=no kyua_cv_getopt_gnu=yes kyua_cv_getopt_optind_reset_value=0 - kyua_cv_signals_lastno=31 kyua_cv_getcwd_null_0_works=yes + kyua_cv_signals_lastno=31 kyua_cv_getcwd_dyn=yes ac_cv_path_GDB=/usr/bin/gdb ac_cv_path_UMOUNT=/usr/bin/umount" -hostmakedepends="pkg-config automake libtool atf-devel doxygen" -makedepends="atf-devel>=0.16 lutok-devel>=0.4 sqlite-devel" -depends="atf" +hostmakedepends="pkg-config automake libtool atf-devel>=0.21" +makedepends="atf-devel>=0.21 lutok-devel>=0.4 sqlite-devel" +depends="atf>=0.21" replaces="kyua-cli>=0 kyua-testers>=0" short_desc="Kyua (automated testing framework) - Command line interface" maintainer="Juan RP " license="Modified BSD" homepage="http://code.google.com/p/kyua" distfiles="https://github.com/jmmv/kyua/archive/kyua-${version}.tar.gz" -checksum=a0f2035c8d1f4ca3097e56ece16730d3fb7c00367bd709dc4eb5fd580308e2c5 +checksum=55a2e1c5ab28748392cfed3b2783ed381ffe2d0247bca9a9ac19ae94fe029172 pre_configure() { autoreconf -fi