From dd691598e1ed9d1a3efcbe99be54549bffeb8145 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Fri, 13 Mar 2015 09:25:31 +0100 Subject: [PATCH] dateutils: fix cross compile with upstream patch --- srcpkgs/dateutils/patches/fix-crossbuild.diff | 36 +++++++++++++++++++ srcpkgs/dateutils/template | 10 ++---- 2 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/dateutils/patches/fix-crossbuild.diff diff --git a/srcpkgs/dateutils/patches/fix-crossbuild.diff b/srcpkgs/dateutils/patches/fix-crossbuild.diff new file mode 100644 index 0000000000..2751e84602 --- /dev/null +++ b/srcpkgs/dateutils/patches/fix-crossbuild.diff @@ -0,0 +1,36 @@ +diff --git a/m4/yuck.m4 b/m4/yuck.m4 +index 4796e9c..6ae4eb9 100644 +--- m4/yuck.m4 ++++ m4/yuck.m4 +@@ -112,7 +112,30 @@ AC_DEFUN([AX_YUCK_SCMVER], [dnl + #define _XOPEN_SOURCE 600 + #define VERSION_FILE "${srcdir}/.version" + #include "yuck-scmver.c" +-]])], [STIP_VERSION=`./conftest$EXEEXT`], [AC_MSG_RESULT([none])]) ++]])], [STIP_VERSION=`./conftest$EXEEXT`], [AC_MSG_RESULT([none])], [dnl ++ AC_MSG_RESULT([impossible, cross-compiling]) ++ if test -f "[]vfile[]" -o \ ++ -f "${srcdir}/[]vfile[]" -o \ ++ -f "${srcdir}/.version"; then ++ AC_MSG_NOTICE([ ++Files that (possibly) mandate versions have been detected. ++These are `]vfile[' or `${srcdir}/]vfile[' or `${srcdir}/.version'. ++However, their contents cannot be automatically checked for integrity ++due to building for a platform other than the current one ++(cross-compiling). ++ ++I will proceed with the most conservative guess for the stipulated ++version, which is `${VERSION}'. ++ ++If that appears to be wrong, or needs overriding, please edit the ++aforementioned files manually. ++ ++Also note, even though this project comes with all the tools to ++perform a successful bootstrap for any of the files above, should ++they go out of date or be deleted, they don't support cross-builds. ++ ]) ++ fi ++ ]) + CPPFLAGS="${save_CPPFLAGS}" + AC_LANG_POP([C]) + diff --git a/srcpkgs/dateutils/template b/srcpkgs/dateutils/template index 82a8a71e9e..fc54921d42 100644 --- a/srcpkgs/dateutils/template +++ b/srcpkgs/dateutils/template @@ -1,7 +1,7 @@ # Template file for 'dateutils' pkgname=dateutils version=0.3.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" short_desc="Nifty command line date and time utilities" @@ -10,12 +10,8 @@ license="BSD" homepage="http://www.fresse.org/dateutils/" distfiles="https://bitbucket.org/hroptatyr/dateutils/downloads/${pkgname}-${version}.tar.xz" checksum=551620b01c08d5feffb68fde6bb669fe09275dd316a79aeca0efcbe3ec774a3e +hostmakedepends="automake libtool libltdl-devel" pre_configure() { - sed -i "/^## check\/generate version files/,/^## check for byteorder utils/d" configure - cat > version.mk <