Upgrade to 44 and work around bug in GCC 4.8 (#922974)

This commit is contained in:
Robert Scheck 2013-03-18 23:17:39 +01:00
parent 30780efef2
commit 968f662d42
3 changed files with 17 additions and 7 deletions

4
.gitignore vendored
View File

@ -1,3 +1 @@
mksh-R40d.cpio.gz mksh-*.tgz
/mksh_40.9.20120630.orig.tar.gz
/mksh-R41.tgz

View File

@ -1,8 +1,8 @@
%define _bindir /bin %define _bindir /bin
Summary: MirBSD enhanced version of the Korn Shell Summary: MirBSD enhanced version of the Korn Shell
Name: mksh Name: mksh
Version: 41 Version: 44
Release: 2%{?dist} Release: 1%{?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
@ -24,7 +24,6 @@ modern, robust shell good for interactive and especially script use, being a
bourne shell replacement, pdksh successor and an alternative to the C shell. bourne shell replacement, pdksh successor and an alternative to the C shell.
%prep %prep
#%setup -q -T -c
%setup -q -n %{name} %setup -q -n %{name}
# we'll need this later due to -DMKSH_GCC55009 # we'll need this later due to -DMKSH_GCC55009
@ -52,9 +51,19 @@ print -r -- $((x++)):$sari=$uari.
EOF EOF
%build %build
# Work around RHBZ #922974 on Fedora 19 and later
%if 0%{?fedora} >= 19
CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL -DMKSH_GCC55009" sh Build.sh -r
%else
CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL -DMKSH_GCC55009" sh Build.sh -r -c lto CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL -DMKSH_GCC55009" sh Build.sh -r -c lto
%endif
cp test.sh test_mksh.sh cp test.sh test_mksh.sh
# Work around RHBZ #922974 on Fedora 19 and later
%if 0%{?fedora} >= 19
CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL -DMKSH_GCC55009" sh Build.sh -L -r
%else
CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL -DMKSH_GCC55009" sh Build.sh -L -r -c lto CFLAGS="$RPM_OPT_FLAGS -DMKSH_DISABLE_EXPERIMENTAL -DMKSH_GCC55009" sh Build.sh -L -r -c lto
%endif
cp test.sh test_lksh.sh cp test.sh test_lksh.sh
%install %install
@ -110,6 +119,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/lksh.1* %{_mandir}/man1/lksh.1*
%changelog %changelog
* Mon Mar 18 2013 Robert Scheck <robert@fedoraproject.org> 44-1
- Upgrade to 44 and work around bug in GCC 4.8 (#922974)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 41-2 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 41-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

View File

@ -1 +1 @@
70eca50d9340412714ef09b7060ebde9 mksh-R41.tgz a1bf8e3a8e6e22ff9430ff27c05785b3 mksh-44-1.fc20.src.rpm