diff options
| author | Dimitri John Ledkov <dimitri.ledkov@canonical.com> | 2014-01-06 05:18:14 +0000 |
|---|---|---|
| committer | Dimitri John Ledkov <dimitri.ledkov@canonical.com> | 2014-01-06 05:18:14 +0000 |
| commit | a02f87ea97fd10e820969f33b8167b80e37ee0bb (patch) | |
| tree | ddb9536b1f9b8ab93b15b8f423450207647b27fc | |
| parent | b4b24000fc06b35a9c20df920f58eff067dc8643 (diff) | |
Fix big-endian FTBFS (Closes: #733831)HEADdebian/0.9.1-1.1master
| -rw-r--r-- | .pc/applied-patches | 1 | ||||
| -rw-r--r-- | .pc/ftbfs-big-endian.patch/config.h | 16 | ||||
| -rw-r--r-- | config.h | 12 | ||||
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/ftbfs-big-endian.patch | 28 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
6 files changed, 61 insertions, 4 deletions
diff --git a/.pc/applied-patches b/.pc/applied-patches index 42835a2..8830f53 100644 --- a/.pc/applied-patches +++ b/.pc/applied-patches @@ -1 +1,2 @@ 20-manpage.patch +ftbfs-big-endian.patch diff --git a/.pc/ftbfs-big-endian.patch/config.h b/.pc/ftbfs-big-endian.patch/config.h new file mode 100644 index 0000000..0109c4a --- /dev/null +++ b/.pc/ftbfs-big-endian.patch/config.h @@ -0,0 +1,16 @@ + +/* Includes and defines for ccan files */ + +#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) + #include <endian.h> +#endif +#ifdef LITTLE_ENDIAN + #define HAVE_LITTLE_ENDIAN 1 + #define HAVE_BIG_ENDIAN 0 +#elif defined(BIG_ENDIAN) + #define HAVE_LITTLE_ENDIAN 0 + #define HAVE_BIG_ENDIAN 1 +#else + #error Unknown endian +#endif + @@ -1,13 +1,17 @@ /* Includes and defines for ccan files */ -#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) - #include <endian.h> +#if !defined(BYTE_ORDER) && !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) + #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + #include <machine/endian.h> + #else + #include <endian.h> + #endif #endif -#ifdef LITTLE_ENDIAN +#if BYTE_ORDER == LITTLE_ENDIAN #define HAVE_LITTLE_ENDIAN 1 #define HAVE_BIG_ENDIAN 0 -#elif defined(BIG_ENDIAN) +#elif BYTE_ORDER == BIG_ENDIAN #define HAVE_LITTLE_ENDIAN 0 #define HAVE_BIG_ENDIAN 1 #else diff --git a/debian/changelog b/debian/changelog index e54f0d9..0570756 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +wiggle (0.9.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix big-endian FTBFS (Closes: #733831) + + -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 06 Jan 2014 05:16:36 +0000 + wiggle (0.9.1-1) unstable; urgency=low * New upstream release diff --git a/debian/patches/ftbfs-big-endian.patch b/debian/patches/ftbfs-big-endian.patch new file mode 100644 index 0000000..5c03da4 --- /dev/null +++ b/debian/patches/ftbfs-big-endian.patch @@ -0,0 +1,28 @@ +Description: Fix big-endian FTBFS (Closes: #733831) +Author: Dimitri John Ledkov <xnox@ubuntu.com> +Bug-Debian: http://bugs.debian.org/733831 + +--- wiggle-0.9.1.orig/config.h ++++ wiggle-0.9.1/config.h +@@ -1,13 +1,17 @@ + + /* Includes and defines for ccan files */ + +-#if !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) +- #include <endian.h> ++#if !defined(BYTE_ORDER) && !defined(LITTLE_ENDIAN) && !defined(BIG_ENDIAN) ++ #if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++ #include <machine/endian.h> ++ #else ++ #include <endian.h> ++ #endif + #endif +-#ifdef LITTLE_ENDIAN ++#if BYTE_ORDER == LITTLE_ENDIAN + #define HAVE_LITTLE_ENDIAN 1 + #define HAVE_BIG_ENDIAN 0 +-#elif defined(BIG_ENDIAN) ++#elif BYTE_ORDER == BIG_ENDIAN + #define HAVE_LITTLE_ENDIAN 0 + #define HAVE_BIG_ENDIAN 1 + #else diff --git a/debian/patches/series b/debian/patches/series index 42835a2..8830f53 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 20-manpage.patch +ftbfs-big-endian.patch |