From 0bca8f75bbe012984ec4a76e45ea4e1f4f888bdd Mon Sep 17 00:00:00 2001 From: vales Date: Thu, 23 Jul 2015 11:19:31 +0500 Subject: [PATCH] Make ./config GCC 5.x aware This patch makes two little things: 1. makes ../config GCC 5.x friendly 2. completely removes wavpack related stuff from Makefile if ../config --disable-wavpack given Last one is for #35 issue. I also stuck into this when compiling w/o wavpack. Compiled with this patch by gcc 5.1.0 on ArchLinux x86_64 from git master: cd pcompress-master patch -Np1 < ../gcc5.patch ./config --prefix=/usr --no-1.3-archive-compat --disable-wavpack make make install have no problems and works fine. --- config | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config b/config index 8e74cce..8a2ef96 100755 --- a/config +++ b/config @@ -293,7 +293,7 @@ IFS=. set -- ${vers} IFS="$OIFS" -if [ $1 -lt 4 -o $2 -lt 4 ] +if [ $1 -lt 4 ] || [ $1 -eq 4 -a $2 -lt 4 ] then echo "ERROR:" echo "GCC version 4.4 or above is required." @@ -804,3 +804,7 @@ s#@WAVPACK_LIBSPEC@#${wavpack_libspec}#g s#@WAVPACK_DIR@#${wavpack_dir}#g " > Makefile +if [ "x${enable_wavpack}" == "x" ] +then + sed -i -e '/^WAVPKSRCS/ D' -e '/^WAVPKOBJS/ D' Makefile +fi