From 0487ce69ba76aa0b5328a862dae3e84f6447e196 Mon Sep 17 00:00:00 2001 From: Jiri Gaisler Date: Sat, 10 Aug 2019 15:56:12 +0200 Subject: [PATCH] Revert commit that breaks sis installation --- source-builder/config/sis-2-1.cfg | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/source-builder/config/sis-2-1.cfg b/source-builder/config/sis-2-1.cfg index 9875728..a07b2db 100644 --- a/source-builder/config/sis-2-1.cfg +++ b/source-builder/config/sis-2-1.cfg @@ -31,19 +31,26 @@ Release: %{release} cd sis-%{sis_version} + ac_prefix=%{_prefix} + + if test "%{_build}" != "%{_host}" ; then + CFLAGS_FOR_BUILD="-g -O2 -Wall" + fi + export CFLAGS CFLAGS_FOR_BUILD CC + if test "%{_target}" != "" ; then SIS_PREFIX="%{_target}-" fi - - %{host_build_flags} - + CFLAGS="$SB_CFLAGS" \ ./configure \ - --build=%{_build} --host=%{_host} --target=%{_target} \ + --build=%{_build} --host=%{_host} \ --program-prefix="$SIS_PREFIX" \ - --prefix=${_prefix} + --prefix=${ac_prefix} %{__make} %{?_smp_mflags} all + unset CFLAGS_FOR_BUILD + cd ${build_top} %install