From f7249b9ddf1b0481c8867c404522a8bed721b752 Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Fri, 17 Apr 2015 18:49:51 +0200 Subject: [PATCH] fixed compilefarm makefile, removed travis tests, enhanced clean script --- autogen.sh | 2 +- tests/gcc-compilefarm/build-makefile | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index e973f4f..961bf6c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -103,7 +103,7 @@ find . -name .libs -exec rm -rf {} \; > /dev/null 2>&1 find . -name .o -exec rm -rf {} \; > /dev/null 2>&1 find . -name .lo -exec rm -rf {} \; > /dev/null 2>&1 find . -name .pyc -exec rm -rf {} \; > /dev/null 2>&1 - +find . -name .dirstamp -exec rm -rf {} \; > /dev/null 2>&1 rm -rf aclocal.m4 libtool configure config.* config autom4te.cache tests/test* tests/v* tests/stresstest/* libpcp/libpcp1.pc rm clean.sh EOF diff --git a/tests/gcc-compilefarm/build-makefile b/tests/gcc-compilefarm/build-makefile index 85c28b3..0e6f560 100644 --- a/tests/gcc-compilefarm/build-makefile +++ b/tests/gcc-compilefarm/build-makefile @@ -22,6 +22,8 @@ HAVESODIUM = $(PREFIX)/_havesodium SRCSODIUM = $(BUILD)/libsodium SRCPCP = $(BUILD)/pcp +PERLVERSION = $(shell perl -e 'print "$^V"' sed 's/v//') + all: prepare fetch config-sodium compile-sodium install-sodium config-pcp compile-pcp install-pcp test-pcp @echo done @@ -86,5 +88,5 @@ clean: rm -rf $(PREFIX) test-pcp: perl - ln -sf $(PREFIX)/share/perl/5.10.1 $(SRCPCP)/tests/lib + ln -sf $(PREFIX)/share/perl/$(PERLVERSION) $(SRCPCP)/tests/lib cd $(SRCPCP) && make test