bison: update to version 2.6.5
This update fixes the grub-2.0 warning issue that was worked around in commit
4f5e655b36
. Consequently, that patch is no longer
needed.
This commit is contained in:
parent
4f5e655b36
commit
3fafdb362b
@ -1,11 +1,11 @@
|
|||||||
{ stdenv, fetchurl, m4, perl }:
|
{ stdenv, fetchurl, m4, perl }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "bison-2.6.4";
|
name = "bison-2.6.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnu/bison/${name}.tar.xz";
|
url = "mirror://gnu/bison/${name}.tar.xz";
|
||||||
sha256 = "e0c3179ed1a622d7ab9679d64b556a7722f9eb7fa32d568ce8f329f89cca52e9";
|
sha256 = "8640d5b51aad462db6863711f333a9159836853e0b1e79fdef708c6efb5cd52b";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
|
buildNativeInputs = [ m4 ] ++ stdenv.lib.optional doCheck perl;
|
||||||
|
@ -49,17 +49,10 @@ stdenv.mkDerivation rec {
|
|||||||
sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
|
sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# Source code generated by bison 2.6.4 contains pragmas that trigger
|
|
||||||
# warnings when built with -Wunknown-pragmas. Since Grub compiles with
|
|
||||||
# -Werror, this causes the build to fail. We work around this issue by
|
|
||||||
# ignoring pragma-related warnings, but clearly it would be better if
|
|
||||||
# Bison wouldn't trigger that issue in the first place. A bug report
|
|
||||||
# has been sent.
|
|
||||||
prePatch =
|
prePatch =
|
||||||
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
|
'' gunzip < "${unifont_bdf}" > "unifont.bdf"
|
||||||
sed -i "configure" \
|
sed -i "configure" \
|
||||||
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" \
|
-e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
|
||||||
-e "s|-Wunknown-pragmas|-Wno-pragmas|g"
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
configureFlags =
|
configureFlags =
|
||||||
|
Loading…
Reference in New Issue
Block a user