JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bochs: Fix compilation with GCC 10

Browse Source 
ZHF: #122042
This commit is contained in:
Claudio Bley 2021-05-10 16:00:06 +02:00 committed by Daniël de Kok
parent 90c2fb1f2f
commit 8fe0744dd1
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/applications/virtualization/bochs/bochs_fix_narrowing_conv_warning.patch Normal file
View File

@ -0,0 +1,29 @@
------------------------------------------------------------------------
r13882 | vruppert | 2020-06-09 09:30:01 +0200 (Tue, 09 Jun 2020) | 2 lines
Compilation fix for MSYS2 gcc 10.1.0 (narrowing conversion).
Index: iodev/display/voodoo_data.h
===================================================================
--- a/iodev/display/voodoo_data.h (revision 13881)
+++ b/iodev/display/voodoo_data.h (revision 13882)
@@ -1837,11 +1837,11 @@
/* fifo content defines */
#define FIFO_TYPES (7 << 29)
-#define FIFO_WR_REG (1 << 29)
-#define FIFO_WR_TEX (2 << 29)
-#define FIFO_WR_FBI_32 (3 << 29)
-#define FIFO_WR_FBI_16L (4 << 29)
-#define FIFO_WR_FBI_16H (5 << 29)
+#define FIFO_WR_REG (1U << 29)
+#define FIFO_WR_TEX (2U << 29)
+#define FIFO_WR_FBI_32 (3U << 29)
+#define FIFO_WR_FBI_16L (4U << 29)
+#define FIFO_WR_FBI_16H (5U << 29)
BX_CPP_INLINE void fifo_reset(fifo_state *f)
{
------------------------------------------------------------------------

6
pkgs/applications/virtualization/bochs/default.nix
View File

@ -26,7 +26,11 @@ stdenv.mkDerivation rec {
sha256 = "0ql8q6y1k356li1g9gbvl21448mlxphxxi6kjb2b3pxvzd0pp2b3";
};
patches = [ ./bochs-2.6.11-glibc-2.26.patch ./fix-build-smp.patch ];
patches = [
./bochs-2.6.11-glibc-2.26.patch
./fix-build-smp.patch
./bochs_fix_narrowing_conv_warning.patch
];
buildInputs =
[ pkg-config libtool gtk2 libGLU libGL readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ]