[SCM] mixxx/master: Remove -Dalpha from CPPDEFINES.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Thu Mar 3 14:10:34 UTC 2011
The following commit has been merged in the master branch:
commit d73f55b1473e31cf6f985fad1c10cc26d4e98101
Author: Alessio Treglia <alessio at debian.org>
Date: Thu Mar 3 15:09:45 2011 +0100
Remove -Dalpha from CPPDEFINES.
diff --git a/debian/patches/15-various_archs_support.patch b/debian/patches/15-various_archs_support.patch
index 534587d..6428336 100644
--- a/debian/patches/15-various_archs_support.patch
+++ b/debian/patches/15-various_archs_support.patch
@@ -2,8 +2,9 @@ Description: Allow the compilation on several architectures.
Author: Alessio Treglia <alessio at debian.org>
Forwarded: no
---
- build/mixxx.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
+ build/depends.py | 3 ++-
+ build/mixxx.py | 5 ++++-
+ 2 files changed, 6 insertions(+), 2 deletions(-)
--- mixxx.orig/build/mixxx.py
+++ mixxx/build/mixxx.py
@@ -20,3 +21,15 @@ Forwarded: no
raise Exception("invalid machine type")
if toolchain not in ['gnu', 'msvs']:
+--- mixxx.orig/build/depends.py
++++ mixxx/build/depends.py
+@@ -591,7 +591,8 @@ class MixxxCore(Feature):
+ # Evaluate this define. There are a lot of different things around the
+ # codebase that use different defines. (AMD64, x86_64, x86, i386, i686,
+ # EM64T). We need to unify them together.
+- build.env.Append(CPPDEFINES=build.machine)
++ if not build.machine=='alpha':
++ build.env.Append(CPPDEFINES=build.machine)
+
+ if build.toolchain_is_gnu:
+ # Default GNU Options
--
mixxx packaging
More information about the pkg-multimedia-commits
mailing list