From 7afbaa3c40781a1c20191a3e635d9f9923bdcf49 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Feb 18 2018 16:21:10 +0000 Subject: Build flags injection is only partially successful (#1543842) --- diff --git a/mksh.spec b/mksh.spec index 617b218..2359ada 100644 --- a/mksh.spec +++ b/mksh.spec @@ -5,7 +5,7 @@ Summary: MirBSD enhanced version of the Korn Shell Name: mksh Version: 56c -Release: 2%{?dist} +Release: 3%{?dist} # BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest) License: MirOS and ISC and BSD Group: System Environment/Shells @@ -64,17 +64,17 @@ EOF %build # Work around RHBZ #922974 on Fedora 19 and later %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -r +CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" LDFLAGS="$RPM_LD_FLAGS" sh Build.sh -r %else -CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -r -c lto +CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" LDFLAGS="$RPM_LD_FLAGS" sh Build.sh -r -c lto %endif cp test.sh test_mksh.sh HAVE_PERSISTENT_HISTORY=0; export HAVE_PERSISTENT_HISTORY # Work around RHBZ #922974 on Fedora 19 and later %if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 -CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -L -r +CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" LDFLAGS="$RPM_LD_FLAGS" sh Build.sh -L -r %else -CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" sh Build.sh -L -r -c lto +CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL" LDFLAGS="$RPM_LD_FLAGS" sh Build.sh -L -r -c lto %endif cp -f test.sh test_lksh.sh @@ -125,7 +125,6 @@ if [ ! -x %{_bindir}/%{name} ]; then fi %files -%defattr(-,root,root,-) %doc dot.mkshrc %{_bindir}/%{name} %{_bindir}/lksh @@ -135,6 +134,9 @@ fi %{_mandir}/man1/lksh.1* %changelog +* Sun Feb 18 2018 Robert Scheck 56c-3 +- Build flags injection is only partially successful (#1543842) + * Thu Feb 08 2018 Fedora Release Engineering - 56c-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild