From 20cb2dceec45740fe521d82a9cf826053dfbc86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= Date: Fri, 30 Oct 2015 12:53:22 +0100 Subject: [PATCH] xz: Prohibited building old lzma parts and fixed build on stage 1. See note! We stoped touching CFLAGS through makeopts as it caused build failures, configure not being able to salvage CFLAGS as a precious var. XZ-Utils can only be built with -std=gnu99 which is defined in its Makefile, but we pass 'CC=gcc' by default and owerwrite teh needed '-std=gnu99' iso we need to workaround the problem manually. --- archiver/xz/xz.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/archiver/xz/xz.conf b/archiver/xz/xz.conf index 1dbbb20d3..4f167b814 100644 --- a/archiver/xz/xz.conf +++ b/archiver/xz/xz.conf @@ -14,4 +14,5 @@ var_append GCC_WRAPPER_APPEND ' ' '-std=gnu99' var_append SYSGCC_WRAPPER_APPEND ' ' '-std=gnu99' -var_append makeopt ' ' 'CFLAGS="-std=gnu99"' +export CC="$CC -std=gnu99" +var_append confopt ' ' ' --disable-lzmadec --disable-lzmainfo --disable-lzma-links'