[SCM] Packaging for bam branch, master, updated. upstream/0.4.0-22-g9dff7c2
Felix Geyer
debfx-pkg at fobos.de
Sat May 14 08:40:03 UTC 2011
The following commit has been merged in the master branch:
commit 9dff7c21e18fa17e28fc876ead502be8e2db022f
Author: Felix Geyer <debfx-pkg at fobos.de>
Date: Sat May 14 10:39:28 2011 +0200
Fix FTBFS on mips.
diff --git a/debian/changelog b/debian/changelog
index dbc90de..cc4d903 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
bam (0.4.0-2) UNRELEASED; urgency=low
- * Fix FTBFS on GNU/kFreeBSD.
+ * Fix FTBFS on GNU/kFreeBSD and mips.
- Add fix-ftbfs-kfreebsd.diff
+ - Add fix-ftbfs-mips.diff
-- Felix Geyer <debfx-pkg at fobos.de> Fri, 13 May 2011 20:33:30 +0200
diff --git a/debian/patches/fix-ftbfs-mips.diff b/debian/patches/fix-ftbfs-mips.diff
new file mode 100644
index 0000000..0a531d5
--- /dev/null
+++ b/debian/patches/fix-ftbfs-mips.diff
@@ -0,0 +1,29 @@
+Description: Fix FTBFS on mips.
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+diff --git a/src/platform.h b/src/platform.h
+--- a/src/platform.h
++++ b/src/platform.h
+@@ -104,6 +104,11 @@
+ #define BAM_ARCH_STRING "sparc"
+ #endif
+
++#if defined(__mips__)
++ #define BAM_ARCH_MIPS
++ #define BAM_ARCH_STRING "mips"
++#endif
++
+
+ #ifndef BAM_FAMILY_STRING
+ #define BAM_FAMILY_STRING "unknown"
+diff --git a/tests/sharedlib/bam.lua b/tests/sharedlib/bam.lua
+--- a/tests/sharedlib/bam.lua
++++ b/tests/sharedlib/bam.lua
+@@ -1,6 +1,6 @@
+ settings = NewSettings()
+
+-if arch == "amd64" then
++if (arch == "amd64") or (arch == "mips") then
+ settings.cc.flags:Add("-fPIC")
+ end
+
diff --git a/debian/patches/series b/debian/patches/series
index 14d0033..e2dc69a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
use-debian-liblua.diff
test-error-exit-code.diff
fix-ftbfs-kfreebsd.diff
+fix-ftbfs-mips.diff
--
Packaging for bam
More information about the Pkg-games-commits
mailing list