From 06917002e052dc81845b3c9c7c96a66c1ff20a0e Mon Sep 17 00:00:00 2001 From: prspkt Date: Thu, 22 Nov 2018 18:25:33 +0200 Subject: [PATCH] tup: update to 0.7.8. --- srcpkgs/tup/patches/aarch64.patch | 22 ---------------------- srcpkgs/tup/template | 13 +++++++------ 2 files changed, 7 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/tup/patches/aarch64.patch diff --git a/srcpkgs/tup/patches/aarch64.patch b/srcpkgs/tup/patches/aarch64.patch deleted file mode 100644 index ba048ff4731..00000000000 --- a/srcpkgs/tup/patches/aarch64.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/tup/platform.c.orig -+++ src/tup/platform.c -@@ -54,6 +54,8 @@ - const char *tup_arch = "sparc"; - #elif __arm__ - const char *tup_arch = "arm"; -+#elif __aarch64__ -+const char *tup_arch = "aarch64"; - #else - #error Unsupported cpu architecture. Please add support in tup/platform.c - #endif ---- tup.1.orig -+++ tup.1 -@@ -684,7 +684,7 @@ - TUP_PLATFORM is a special @-variable. If CONFIG_TUP_PLATFORM is not set in the tup.config file, it has a default value according to the platform that tup itself was compiled in. Currently the default value is one of "linux", "solaris", "macosx", "win32", or "freebsd". - .TP - .B @(TUP_ARCH) --TUP_ARCH is another special @-variable. If CONFIG_TUP_ARCH is not set in the tup.config file, it has a default value according to the processor architecture that tup itself was compiled in. Currently the default value is one of "i386", "x86_64", "powerpc", "powerpc64", "ia64", "alpha", "sparc" or "arm". -+TUP_ARCH is another special @-variable. If CONFIG_TUP_ARCH is not set in the tup.config file, it has a default value according to the processor architecture that tup itself was compiled in. Currently the default value is one of "i386", "x86_64", "powerpc", "powerpc64", "ia64", "alpha", "sparc", "arm", or "aarch64". - - .SH "VARIANTS" - Tup supports variants, which allow you to build your project multiple times with different configurations. Perhaps the most common case is to build a release and a debug configuration with different compiler flags, though any number of variants can be used to support whatever configurations you like. Each variant is built in its own directory distinct from each other and from the source tree. When building with variants, the in-tree build is disabled. To create a variant, make a new directory at the top of the tup hierarchy and create a "tup.config" file there. For example: diff --git a/srcpkgs/tup/template b/srcpkgs/tup/template index 0fc35986256..8315c259bc7 100644 --- a/srcpkgs/tup/template +++ b/srcpkgs/tup/template @@ -1,18 +1,18 @@ # Template file for 'tup' -pkgname="tup" -version="0.7.5" +pkgname=tup +version=0.7.8 revision=1 hostmakedepends="fuse-devel pkg-config" -makedepends="fuse-devel sqlite-devel" +makedepends="fuse-devel pcre-devel sqlite-devel" short_desc="File-based build system" maintainer="Julien Dehos " +license="GPL-2.0-only" homepage="http://gittup.org/tup/index.html" -license="GPL-2" distfiles="https://github.com/gittup/${pkgname}/archive/v${version}.tar.gz" -checksum="361b3e069308ce1d9505d1cb927999ac448811a3425c724123e0c48602a9d1e4" +checksum=37baed2d12ef6ce66ce186dc5aa9bcf23098c35d3aee2dc25cb3177eee224b60 do_configure() { - sed -i "s/git describe/echo v${version}/" Tupfile + sed -i "s/git describe/echo ${version}/" src/tup/link.sh sed -i "s/CC = gcc/CC = ${CC}/" Tuprules.tup sed -i "1iCFLAGS=${CFLAGS}" Tuprules.tup sed -i "1iLDFLAGS=${LDFLAGS}" Tuprules.tup @@ -23,6 +23,7 @@ do_build() { # build tup for host arch using a script CC="$BUILD_CC" CFLAGS="$BUILD_CFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ ./build.sh + ./build/tup init # build tup for target arch using the previous build (boostrapping) ./build/tup generate script.sh