tags 373127 + patch thanks
Hi, I confirm that including <linux/bitops.h> seems useless. The following patch drops the include. It fixes the FTBFS on mips, and still successfully builds on alpha, i386 and sparc. I didn't check any other architecture, but I am pretty confident it will work too. While building, I discovered that flex and bison are missing in build-depends. When flex and bison are not installed, server/rcparse_lex.c and rcparse_tab.c are not rebuilt, the ones brought in the upstream tarball are used instead. However, they do not work on at least sparc and mips (endianness problem?). It makes the build fails later, when linking in server/ because shm.o contains shm_TSR_quit instead of shm_quit. Thus, the following patch also adds flex and bison to build-depends. Brice
diff -u twin-0.5.1/debian/control twin-0.5.1/debian/control --- twin-0.5.1/debian/control +++ twin-0.5.1/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Marco Bodrato <[EMAIL PROTECTED]> Uploaders: Marco Presi (Zufus) <[EMAIL PROTECTED]>, Marco Bodrato <[EMAIL PROTECTED]> -Build-Depends: debhelper (>> 4.0.0), libgpmg1-dev, libncurses5-dev, libx11-dev, libxpm-dev, x-dev, zlib1g-dev, m4, dpatch +Build-Depends: debhelper (>> 4.0.0), libgpmg1-dev, libncurses5-dev, libx11-dev, libxpm-dev, x-dev, zlib1g-dev, m4, dpatch, flex, bison Standards-Version: 3.6.2.1 Package: twin diff -u twin-0.5.1/debian/changelog twin-0.5.1/debian/changelog --- twin-0.5.1/debian/changelog +++ twin-0.5.1/debian/changelog @@ -1,3 +1,14 @@ +twin (0.5.1-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Add drop_include_bitops.dpatch to stop including <linux/bitops.h> + since it is not required and causes a FTBFS on mips, closes: #373127. + * Add flex and bison to build-depends so that server/rcparse_lex.c and + rcparse_tab.c are rebuilt instead of using the ones shipped in the + tarball, which do not work on all architectures. + + -- Brice Goglin <[EMAIL PROTECTED]> Sun, 7 Jan 2007 19:09:37 +0100 + twin (0.5.1-3) unstable; urgency=low * Fixes the wrong fix in the previous upload: in libtw0-dev reintroduced explict diff -u twin-0.5.1/debian/patches/00list twin-0.5.1/debian/patches/00list --- twin-0.5.1/debian/patches/00list +++ twin-0.5.1/debian/patches/00list @@ -2,0 +3 @@ +drop_include_bitops.dpatch only in patch2: unchanged: --- twin-0.5.1.orig/debian/patches/drop_include_bitops.dpatch +++ twin-0.5.1/debian/patches/drop_include_bitops.dpatch @@ -0,0 +1,17 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gcc-4.0.dpatch by Andreas Jochens <[EMAIL PROTECTED]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: including linux/bitops.h is broken, and we actually do not need it + [EMAIL PROTECTED]@ +--- twin-0.5.1.orig/server/HW/hw_tty_linux/kbd_raw1.h 2007-01-07 17:51:12.000000000 +0100 ++++ twin-0.5.1/server/HW/hw_tty_linux/kbd_raw1.h 2007-01-07 17:51:37.000000000 +0100 +@@ -40,7 +40,6 @@ + #include <linux/kd.h> + #include <linux/keyboard.h> + #include <linux/vt.h> +-#include <linux/bitops.h> + + + #define SIZE(array) (sizeof(array)/sizeof(array[0]))
signature.asc
Description: OpenPGP digital signature
