rpms/mksh
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Build flags injection is only partially successful (#1543842)

Browse Source
This commit is contained in:
Robert Scheck 2018-02-18 17:21:10 +01:00
parent 52e171def2
commit 7afbaa3c40
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mksh.spec
View File

@ -5,7 +5,7 @@
Summary: MirBSD enhanced version of the Korn Shell Summary: MirBSD enhanced version of the Korn Shell
Name: mksh Name: mksh
Version: 56c Version: 56c
Release: 2%{?dist} Release: 3%{?dist}
# BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest) # BSD (setmode.c), ISC (strlcpy.c), MirOS (the rest)
License: MirOS and ISC and BSD License: MirOS and ISC and BSD
Group: System Environment/Shells Group: System Environment/Shells
@ -64,17 +64,17 @@ EOF
%build %build
# Work around RHBZ #922974 on Fedora 19 and later # Work around RHBZ #922974 on Fedora 19 and later
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 %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 %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 %endif
cp test.sh test_mksh.sh cp test.sh test_mksh.sh
HAVE_PERSISTENT_HISTORY=0; export HAVE_PERSISTENT_HISTORY HAVE_PERSISTENT_HISTORY=0; export HAVE_PERSISTENT_HISTORY
# Work around RHBZ #922974 on Fedora 19 and later # Work around RHBZ #922974 on Fedora 19 and later
%if 0%{?fedora} >= 19 || 0%{?rhel} >= 7 %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 %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 %endif
cp -f test.sh test_lksh.sh cp -f test.sh test_lksh.sh
@ -125,7 +125,6 @@ if [ ! -x %{_bindir}/%{name} ]; then
fi fi
%files %files
%defattr(-,root,root,-)
%doc dot.mkshrc %doc dot.mkshrc
%{_bindir}/%{name} %{_bindir}/%{name}
%{_bindir}/lksh %{_bindir}/lksh
@ -135,6 +134,9 @@ fi
%{_mandir}/man1/lksh.1* %{_mandir}/man1/lksh.1*
%changelog %changelog
* Sun Feb 18 2018 Robert Scheck <robert@fedoraproject.org> 56c-3
- Build flags injection is only partially successful (#1543842)
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 56c-2 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 56c-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild