[X2Go-Commits] [nx-libs] 27/29: Fix FTBFS on ppc64 architecture (054_nx-X11_ppc64-ftbfs.full.patch).

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 05:21:49 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 0b711de48cdb04f4328eff75f82b97f9a07cbfbf
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Feb 9 15:49:51 2015 +0100

    Fix FTBFS on ppc64 architecture (054_nx-X11_ppc64-ftbfs.full.patch).
---
 debian/patches/054_nx-X11_ppc64-ftbfs.full.patch |   14 --------------
 debian/patches/series                            |    1 -
 nx-X11/lib/GL/mesa/main/Imakefile.inc            |    3 +++
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch b/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch
deleted file mode 100644
index d60426e..0000000
--- a/debian/patches/054_nx-X11_ppc64-ftbfs.full.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fix FTBFS on ppc64 architecture
-Author: Orion Poplawski <orion at cora.nwra.com>
-diff -up a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc
---- a/nx-X11/lib/GL/mesa/main/Imakefile.inc	2014-01-04 13:39:35.000000000 -0700
-+++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc	2014-01-24 12:04:00.085272615 -0700
-@@ -1,5 +1,8 @@
- XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
- 
-+/* gcc on ppc64 defines this, causes macro recursion with pixel below */
-+#undef pixel
-+
- #ifndef MesaBuildDir
- #define MesaBuildDir $(GLXLIBSRC)/mesa/main/
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 5e2e29e..1b73117 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-054_nx-X11_ppc64-ftbfs.full.patch
 055_nx-X11_imake-Werror-format-security.full.patch
 056_nx-X11_Werror-format-security.full.patch
 057_nx-X11_sanitize-eventmasks.full.patch
diff --git a/nx-X11/lib/GL/mesa/main/Imakefile.inc b/nx-X11/lib/GL/mesa/main/Imakefile.inc
index 5deaf10..80b3aef 100644
--- a/nx-X11/lib/GL/mesa/main/Imakefile.inc
+++ b/nx-X11/lib/GL/mesa/main/Imakefile.inc
@@ -1,5 +1,8 @@
 XCOMM $XFree86: xc/lib/GL/mesa/src/Imakefile.inc,v 1.7tsi Exp $
 
+/* gcc on ppc64 defines this, causes macro recursion with pixel below */
+#undef pixel
+
 #ifndef MesaBuildDir
 #define MesaBuildDir $(GLXLIBSRC)/mesa/main/
 #endif

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list