aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOrion Poplawski <orion@cora.nwra.com>2015-02-09 15:49:51 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:49:51 +0100
commit0b711de48cdb04f4328eff75f82b97f9a07cbfbf (patch)
tree02358431b67192acc8497d780ba478be657fad39
parent9ea734b21c6f5485b0db305fa04b023b513e2490 (diff)
downloadnx-libs-0b711de48cdb04f4328eff75f82b97f9a07cbfbf.tar.gz
nx-libs-0b711de48cdb04f4328eff75f82b97f9a07cbfbf.tar.bz2
nx-libs-0b711de48cdb04f4328eff75f82b97f9a07cbfbf.zip
Fix FTBFS on ppc64 architecture (054_nx-X11_ppc64-ftbfs.full.patch).
-rw-r--r--debian/patches/054_nx-X11_ppc64-ftbfs.full.patch14
-rw-r--r--debian/patches/series1
-rw-r--r--nx-X11/lib/GL/mesa/main/Imakefile.inc3
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 d60426e91..000000000
--- 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@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 5e2e29e68..1b731170f 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 5deaf1038..80b3aef07 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