Bug#660415: openmsx FTBFS in unstable. /usr/include/zlib.h:1204:26: error: conflicting declaration 'typedef struct gzFile_s* gzFile'
Package: openmsx
Severity: serious
Tags: patch
x-debbugs-cc: wijnen@debian.org
openmsx FTBFS in unstable with the following error.
Compiling serialize.cc...
g++ \
-MP -MMD -MF derived/x86_64-linux-debian/dep/serialize.d \
-o derived/x86_64-linux-debian/obj/serialize.o -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -O3 -m64 -pipe -Wall -Wextra -Wundef -Wunused-macros -Wno-missing-field-initializers -Isrc -Isrc/cassette -Isrc/commands -Isrc/config -Isrc/console -Isrc/cpu -Isrc/debugger -Isrc/events -Isrc/fdc -Isrc/file -Isrc/ide -Isrc/input -Isrc/laserdisc -Isrc/memory -Isrc/security -Isrc/serial -Isrc/settings -Isrc/sound -Isrc/thread -Isrc/utils -Isrc/video -Isrc/video/ld -Isrc/video/scalers -Isrc/video/v9990 -Iderived/x86_64-linux-debian/config -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/include/freetype2 -I/usr/include/libpng12 -DPACKAGE_NAME=tcl -DPACKAGE_TARNAME=tcl -DPACKAGE_VERSION=8.5 -DPACKAGE_STRING=tcl\\\ 8.5 -DPACKAGE_BUGREPORT= -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_LIMITS_H=1 -DHAVE_SYS_PARAM_H=1 -DUSE_THREAD_ALLOC=1 -D_REENTRANT=1 -D_THREAD_SAFE=1 -DHAVE_PTHREAD_ATTR_SETSTACKSIZE=1 -DHAVE_PTHREAD_GETATTR_NP=1 -DGETATTRNP_NOT_DECLARED=1 -DTCL_THREADS=1 -DTCL_CFGVAL_ENCODING=iso8859-1 -DMODULE_SCOPE=extern\ __attribute__\(\(__visibility__\(hidden\)\)\) -DTCL_SHLIB_EXT=.so -DTCL_CFG_OPTIMIZED=1 -DTCL_CFG_DEBUG=1 -DTCL_TOMMATH=1 -DMP_PREC=4 -D_LARGEFILE64_SOURCE=1 -DTCL_WIDE_INT_IS_LONG=1 -DHAVE_GETCWD=1 -DHAVE_OPENDIR=1 -DHAVE_STRTOL=1 -DHAVE_WAITPID=1 -DHAVE_GETADDRINFO=1 -DHAVE_GETPWUID_R_5=1 -DHAVE_GETPWUID_R=1 -DHAVE_GETPWNAM_R_5=1 -DHAVE_GETPWNAM_R=1 -DHAVE_GETGRGID_R_5=1 -DHAVE_GETGRGID_R=1 -DHAVE_GETGRNAM_R_5=1 -DHAVE_GETGRNAM_R=1 -DHAVE_GETHOSTBYNAME_R_6=1 -DHAVE_GETHOSTBYNAME_R=1 -DHAVE_GETHOSTBYADDR_R_8=1 -DHAVE_GETHOSTBYADDR_R=1 -DUSE_TERMIOS=1 -DHAVE_SYS_TIME_H=1 -DTIME_WITH_SYS_TIME=1 -DHAVE_GMTIME_R=1 -DHAVE_LOCALTIME_R=1 -DHAVE_MKTIME=1 -DHAVE_TM_GMTOFF=1 -DHAVE_TIMEZONE_VAR=1 -DHAVE_STRUCT_STAT_ST_BLOCKS=1 -DHAVE_STRUCT_STAT_ST_BLKSIZE=1 -DHAVE_BLKCNT_T=1 -DHAVE_INTPTR_T=1 -DHAVE_UINTPTR_T=1 -DHAVE_SIGNED_CHAR=1 -DHAVE_LANGINFO=1 -DHAVE_SYS_IOCTL_H=1 -DTCL_UNLOAD_DLLS=1 -I/usr/include/tcl8.5 -I/usr/include/libxml2 -c src/serialize.cc
In file included from src/serialize.cc:15:0:
/usr/include/zlib.h:1204:26: error: conflicting declaration 'typedef struct gzFile_s* gzFile'
src/serialize.hh:20:15: error: 'gzFile' has a previous declaration as 'typedef void* gzFile'
make[1]: *** [derived/x86_64-linux-debian/obj/serialize.o] Error 1
make[1]: Leaving directory `/build/buildd-openmsx_0.8.1-4+b1-amd64-0_JeL0/openmsx-0.8.1'
make: *** [build-stamp] Error 2
This appears to be the result of a change in zlib.h changing how gzfile
is defined.
The attatched patch removes the definition of gzfile from serialize.hh
and replaces it with an include of zlib.h
Note: I'm ccing wijnen@debian.org as he has expressed an intent to adopt
this package.
Description: Fix build with recent zlib
replace definition of gzFile which conflicts with recent zlib with include
of zlib.h
Author: Peter Michael Green <plugwash@p10link.net>
Bug-Debian: http://bugs.debian.org/???????
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- openmsx-0.8.1.orig/src/serialize.hh
+++ openmsx-0.8.1/src/serialize.hh
@@ -16,8 +16,7 @@
#include <sstream>
#include <cassert>
#include <memory>
-
-typedef void* gzFile;
+#include <zlib.h>
namespace openmsx {
Reply to: