tags 673579 + pending thanks Hi (I added Michael Taautschnig directly to the loop) On Sat, May 19, 2012 at 11:25:41PM +0100, Steven Chamberlain wrote: > tags 673579 + patch > thanks > > On 19/05/12 23:02, Christoph Egger wrote: > > Steven Chamberlain <steven@pyro.eu.org> writes: > >> #if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) > > > > __GLIBC__ should cover all of them alone. Or alternatively consistently > > checking for kernels [...] > > Oh I see, thanks. I think it is the userland we are interested in here > so __GLIBC__ sounds right. > > Please find a patch attached (to apply after KiBi's) which I have tested > on kfreebsd-i386. > > I've no idea if __GLIBC__ exists on __APPLE__ or other non-Debian > platforms but I guess we don't need to worry about them, so I've left > that alone. Steven, many thanks for pointing to this. Michael, I did the NMU some days ago, trying to help on some RC bugs for wheezy. I will upload the package with the fix again, with DELAYED/2 only. Please let me know if I should cancel, and if you would like to do the upload. Regards, and sorry for the noise Salvatore
diff -Nru cbmc-4.1/debian/changelog cbmc-4.1/debian/changelog --- cbmc-4.1/debian/changelog 2012-05-13 14:25:55.000000000 +0200 +++ cbmc-4.1/debian/changelog 2012-05-20 07:56:05.000000000 +0200 @@ -1,3 +1,13 @@ +cbmc (4.1-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Update fix-FTBFS-with-gcc-4.7.patch patch. + Fix FTBFS with gcc 4.7 on kfreebsd and hurd. + Thanks to Steven Chamberlain <steven@pyro.eu.org> for the patch. + (Closes: #673579) + + -- Salvatore Bonaccorso <carnil@debian.org> Sun, 20 May 2012 07:55:28 +0200 + cbmc (4.1-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch --- cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch 2012-05-13 14:25:55.000000000 +0200 +++ cbmc-4.1/debian/patches/fix-FTBFS-with-gcc-4.7.patch 2012-05-20 07:56:05.000000000 +0200 @@ -4,7 +4,7 @@ Bug-Debian: http://bugs.debian.org/667131 Forwarded: no Author: Cyril Brulebois <kibi@debian.org> -Last-Update: 2012-05-13 +Last-Update: 2012-05-20 --- a/src/ansi-c/c_preprocess.cpp +++ b/src/ansi-c/c_preprocess.cpp @@ -13,7 +13,7 @@ #include <string.h> -#ifdef __LINUX__ -+#ifdef __linux__ ++#ifdef __GLIBC__ #include <unistd.h> #endif
Attachment:
signature.asc
Description: Digital signature