Control: tags -1 +patch Hi! It looks like you forgot to apply the patch while fixing the other FTBFSes.
I re-tested that the patch still works with the new version (1.9.0-2). Trivial debdiff attached. -- A tit a day keeps the vet away.
diff -Nru wimlib-1.9.0/debian/changelog wimlib-1.9.0/debian/changelog --- wimlib-1.9.0/debian/changelog 2016-02-09 01:01:31.000000000 +0100 +++ wimlib-1.9.0/debian/changelog 2016-02-09 14:23:16.000000000 +0100 @@ -1,3 +1,10 @@ +wimlib (1.9.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS on x32 (Closes: #814138) + + -- Adam Borowski <[email protected]> Tue, 09 Feb 2016 14:22:57 +0100 + wimlib (1.9.0-2) unstable; urgency=medium * Do not create jquery symlink (see /usr/share/doc/doxygen/README.jquery) diff -Nru wimlib-1.9.0/debian/patches/series wimlib-1.9.0/debian/patches/series --- wimlib-1.9.0/debian/patches/series 2016-02-08 22:31:13.000000000 +0100 +++ wimlib-1.9.0/debian/patches/series 2016-02-09 14:23:54.000000000 +0100 @@ -1,2 +1,3 @@ 0001-Fix-mkntfs-path.patch 0002-Disable-FUSE-related-tests.patch +x32.patch diff -Nru wimlib-1.9.0/debian/patches/x32.patch wimlib-1.9.0/debian/patches/x32.patch --- wimlib-1.9.0/debian/patches/x32.patch 1970-01-01 01:00:00.000000000 +0100 +++ wimlib-1.9.0/debian/patches/x32.patch 2016-02-09 14:28:00.000000000 +0100 @@ -0,0 +1,30 @@ +Description: don't use amd64 assembly on x32 + The way upstream detects amd64 mistakenly applies to x32 as well. This + patch fixes the detection, using the C version of the code instead. + . + It should be easy to port the assembly by using ecx instead of rcx + (a pointer is added to it), but that's for someone with a clue about + SSE instructions -- my knowledge ends at 8086. +Author: Adam Borowski <[email protected]> +Bug-Debian: https://bugs.debian.org/814138 + +--- wimlib-1.9.0.orig/src/lzms_common.c ++++ wimlib-1.9.0/src/lzms_common.c +@@ -378,7 +378,7 @@ lzms_dilute_symbol_frequencies(u32 freqs + } + + +-#ifdef __x86_64__ ++#if defined __x86_64__ && !defined __ILP32__ + static inline u8 * + find_next_opcode_sse4_2(u8 *p) + { +@@ -609,7 +609,7 @@ lzms_x86_filter(u8 data[restrict], s32 s + p = data + 1; + tail_ptr = &data[size - 16]; + +-#ifdef __x86_64__ ++#if defined __x86_64__ && !defined __ILP32__ + if (x86_have_cpu_feature(X86_CPU_FEATURE_SSE4_2)) { + u8 saved_byte = *tail_ptr; + *tail_ptr = 0xE8;
