[SCM] Packaging for teeworlds branch, master, updated. upstream/0.6.0-14-g372bab3
Felix Geyer
debfx-pkg at fobos.de
Sun May 15 09:38:14 UTC 2011
The following commit has been merged in the master branch:
commit 372bab32800a2db618721facaf938c181933d2e9
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Sun May 15 11:35:32 2011 +0200
Use gcc macros instead of an incomplete list of architectures to detect the endianess.
diff --git a/debian/changelog b/debian/changelog
index eca8449..844908d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ teeworlds (0.6.0-1) UNRELEASED; urgency=low
- Build-depend on icoutils and imagemagick.
* Fix FTBFS on kfreebsd.
- Add fix-ftbfs-kfreebsd.patch
+ * Use gcc macros instead of an incomplete list of architectures to detect
+ the endianess.
+ - Add gcc-endianess.patch
-- Felix Geyer <debfx-pkg at fobos.de> Mon, 09 May 2011 11:09:33 +0200
diff --git a/debian/patches/gcc-endianess.patch b/debian/patches/gcc-endianess.patch
new file mode 100644
index 0000000..e45227a
--- /dev/null
+++ b/debian/patches/gcc-endianess.patch
@@ -0,0 +1,65 @@
+diff --git a/src/base/detect.h b/src/base/detect.h
+--- a/src/base/detect.h
++++ b/src/base/detect.h
+@@ -69,35 +69,56 @@
+ #endif
+
+
++/* endianess on gcc */
++#ifdef __GNUC__
++ #include <endian.h>
++ #if __BYTE_ORDER == __LITTLE_ENDIAN
++ #define CONF_ARCH_ENDIAN_LITTLE 1
++ #elif __BYTE_ORDER == __BIG_ENDIAN
++ #define CONF_ARCH_ENDIAN_BIG 1
++ #endif
++#endif
++
++
+ /* architectures */
+ #if defined(i386) || defined(__i386__) || defined(__x86__) || defined(CONF_PLATFORM_WIN32)
+ #define CONF_ARCH_IA32 1
+ #define CONF_ARCH_STRING "ia32"
+- #define CONF_ARCH_ENDIAN_LITTLE 1
++ #if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
++ #define CONF_ARCH_ENDIAN_LITTLE 1
++ #endif
+ #endif
+
+ #if defined(__ia64__)
+ #define CONF_ARCH_IA64 1
+ #define CONF_ARCH_STRING "ia64"
+- #define CONF_ARCH_ENDIAN_LITTLE 1
++ #if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
++ #define CONF_ARCH_ENDIAN_LITTLE 1
++ #endif
+ #endif
+
+ #if defined(__amd64__) || defined(__x86_64__)
+ #define CONF_ARCH_AMD64 1
+ #define CONF_ARCH_STRING "amd64"
+- #define CONF_ARCH_ENDIAN_LITTLE 1
++ #if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
++ #define CONF_ARCH_ENDIAN_LITTLE 1
++ #endif
+ #endif
+
+ #if defined(__powerpc__) || defined(__ppc__)
+ #define CONF_ARCH_PPC 1
+ #define CONF_ARCH_STRING "ppc"
+- #define CONF_ARCH_ENDIAN_BIG 1
++ #if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
++ #define CONF_ARCH_ENDIAN_BIG 1
++ #endif
+ #endif
+
+ #if defined(__sparc__)
+ #define CONF_ARCH_SPARC 1
+ #define CONF_ARCH_STRING "sparc"
+- #define CONF_ARCH_ENDIAN_BIG 1
++ #if !defined(CONF_ARCH_ENDIAN_LITTLE) && !defined(CONF_ARCH_ENDIAN_BIG)
++ #define CONF_ARCH_ENDIAN_BIG 1
++ #endif
+ #endif
+
+
diff --git a/debian/patches/series b/debian/patches/series
index 7b62431..7bc9ded 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ new-wavpack.patch
set-data-dir.patch
pass-build-flags.patch
fix-ftbfs-kfreebsd.patch
+gcc-endianess.patch
--
Packaging for teeworlds
More information about the Pkg-games-commits
mailing list