From: inikep Date: Wed, 17 Aug 2016 14:29:57 +0000 (+0200) Subject: fixed paramgrill dependency X-Git-Tag: v0.8.1^2~5^2~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79b4062c81f87777f474c762edade5ab2a7ff183;p=thirdparty%2Fzstd.git fixed paramgrill dependency --- diff --git a/.travis.yml b/.travis.yml index d421eb98d..86208f66e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,14 +73,15 @@ matrix: sources: - ubuntu-toolchain-r-test packages: - - gcc-multilib - - gcc-4.8-multilib-powerpc-linux-gnu - gcc-5-multilib - gcc-6-multilib - - binfmt-support - qemu-system-ppc - qemu-user-static - gcc-powerpc-linux-gnu + - gcc-4.8-multilib-powerpc-linux-gnu + - gcc-4.8-powerpc-linux-gnu + - binutils-powerpc-linux-gnu + - binfmt-support # OS X Mavericks - os: osx env: PLATFORM="OS X Mavericks" CMD="make gnu90test && make clean && make test && make clean && make travis-install" diff --git a/programs/Makefile b/programs/Makefile index f5efd0837..9c70f868b 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -122,7 +122,7 @@ zstd-pgo : clean zstd rm zstd $(MAKE) zstd MOREFLAGS=-fprofile-use -zstd-frugal: $(ZSTD_FILES) zstdcli.c fileio.c +zstd-frugal: $(ZSTDDECOMP_O) $(ZSTD_FILES) zstdcli.c fileio.c $(CC) $(FLAGS) -DZSTD_NOBENCH -DZSTD_NODICT -DZSTD_LEGACY_SUPPORT=0 $^ -o zstd$(EXT) zstd-compress: $(ZSTDCOMMON_FILES) $(ZSTDCOMP_FILES) \ @@ -162,13 +162,13 @@ zstreamtest : $(ZSTDDECOMP_O) $(ZSTD_FILES) datagen.c zstreamtest.c zstreamtest32 : $(ZSTDDECOMP32_O) $(ZSTD_FILES) datagen.c zstreamtest.c $(CC) -m32 $(FLAGS) $^ -o $@$(EXT) -paramgrill : $(ZSTD_FILES) datagen.c paramgrill.c +paramgrill : $(ZSTDDECOMP_O) $(ZSTD_FILES) datagen.c paramgrill.c $(CC) $(FLAGS) $^ -lm -o $@$(EXT) datagen : datagen.c datagencli.c $(CC) $(FLAGS) $^ -o $@$(EXT) -roundTripCrash : $(ZSTD_FILES) roundTripCrash.c +roundTripCrash : $(ZSTDDECOMP_O) $(ZSTD_FILES) roundTripCrash.c $(CC) $(FLAGS) $^ -o $@$(EXT) clean: