Hello, Samuel Thibault, le lun. 04 juin 2018 00:19:45 +0200, a ecrit: > librdkafka is currently FTBFS on hurd-i386, thus preventing rsyslog from > building, and thus from the standard task to be installable at all. > > The attached patch fixes the couple of odd assumptions that make the > build fail, could you apply them soon so we can have an installable > hurd-i386 system again?
"soon" can't really wait for months :) I have uploaded the attached changes to DELAYED/0. Samuel
diff -Nru librdkafka-0.11.6/debian/changelog librdkafka-0.11.6/debian/changelog --- librdkafka-0.11.6/debian/changelog 2018-10-24 11:01:10.000000000 +0200 +++ librdkafka-0.11.6/debian/changelog 2018-11-04 18:41:48.000000000 +0100 @@ -1,3 +1,10 @@ +librdkafka (0.11.6-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patch to fix hurd-i386 build (Closes: #900716). + + -- Samuel Thibault <[email protected]> Sun, 04 Nov 2018 18:41:48 +0100 + librdkafka (0.11.6-1) unstable; urgency=medium * New upstream version diff -Nru librdkafka-0.11.6/debian/patches/hurd.diff librdkafka-0.11.6/debian/patches/hurd.diff --- librdkafka-0.11.6/debian/patches/hurd.diff 1970-01-01 01:00:00.000000000 +0100 +++ librdkafka-0.11.6/debian/patches/hurd.diff 2018-11-04 18:41:07.000000000 +0100 @@ -0,0 +1,28 @@ +Index: librdkafka-0.11.4/src/rd.h +=================================================================== +--- librdkafka-0.11.4.orig/src/rd.h ++++ librdkafka-0.11.4/src/rd.h +@@ -158,8 +158,8 @@ static RD_INLINE RD_UNUSED char *rd_strn + #ifdef __APPLE__ + /* Some versions of MacOSX dont have IOV_MAX */ + #define IOV_MAX 1024 +-#elif defined(_MSC_VER) +-/* There is no IOV_MAX on MSVC but it is used internally in librdkafka */ ++#elif defined(_MSC_VER) || defined(__GNU__) ++/* There is no IOV_MAX on MSVC or GNU but it is used internally in librdkafka */ + #define IOV_MAX 1024 + #else + #error "IOV_MAX not defined" +Index: librdkafka-0.11.4/src/snappy_compat.h +=================================================================== +--- librdkafka-0.11.4.orig/src/snappy_compat.h ++++ librdkafka-0.11.4/src/snappy_compat.h +@@ -5,7 +5,7 @@ + + #ifdef __FreeBSD__ + # include <sys/endian.h> +-#elif defined(__APPLE_CC_) || defined(__MACH__) /* MacOS/X support */ ++#elif defined(__APPLE_CC_) || (defined(__MACH__) && defined(__APPLE__)) /* MacOS/X support */ + # include <machine/endian.h> + + #if __DARWIN_BYTE_ORDER == __DARWIN_LITTLE_ENDIAN diff -Nru librdkafka-0.11.6/debian/patches/series librdkafka-0.11.6/debian/patches/series --- librdkafka-0.11.6/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ librdkafka-0.11.6/debian/patches/series 2018-11-04 18:41:18.000000000 +0100 @@ -0,0 +1 @@ +hurd.diff
