summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-11 22:44:25 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-11 22:44:25 +0100
commit6b53fbcc205346be60ea0a8e01c7cb0bbeeba55a (patch)
tree355fe49ea083f6db8605e9ce424485e8b40ab138
parent364aaa6dfa706a6fe4afc85b5688a02daab75b26 (diff)
downloadpoky-6b53fbcc205346be60ea0a8e01c7cb0bbeeba55a.tar.gz
xpsb-glx: Fix compile issues on 64 bit machines without 32 bit headers/binaries
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-emenlow/packages/xpsb-glx/xpsb-glx-0.18/native-matypes.patch20
-rw-r--r--meta-emenlow/packages/xpsb-glx/xpsb-glx_0.18.bb9
2 files changed, 26 insertions, 3 deletions
diff --git a/meta-emenlow/packages/xpsb-glx/xpsb-glx-0.18/native-matypes.patch b/meta-emenlow/packages/xpsb-glx/xpsb-glx-0.18/native-matypes.patch
new file mode 100644
index 0000000000..26b1f52a3e
--- /dev/null
+++ b/meta-emenlow/packages/xpsb-glx/xpsb-glx-0.18/native-matypes.patch
@@ -0,0 +1,20 @@
1Index: mesa/src/mesa/x86/Makefile
2===================================================================
3--- mesa.orig/src/mesa/x86/Makefile 2010-10-11 16:34:12.664960996 +0100
4+++ mesa/src/mesa/x86/Makefile 2010-10-11 16:34:43.854960861 +0100
5@@ -20,11 +20,12 @@
6 -rm -f matypes.h gen_matypes
7
8
9-gen_matypes: gen_matypes.c
10- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
11+#gen_matypes: gen_matypes.c
12+# $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
13
14 # need some special rules here, unfortunately
15-matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
16+matypes.h: ../main/mtypes.h ../tnl/t_context.h
17+# gen_matypes
18 ./gen_matypes > matypes.h
19
20 common_x86_asm.o: matypes.h
diff --git a/meta-emenlow/packages/xpsb-glx/xpsb-glx_0.18.bb b/meta-emenlow/packages/xpsb-glx/xpsb-glx_0.18.bb
index 6da48bdb69..6ceb1cbe08 100644
--- a/meta-emenlow/packages/xpsb-glx/xpsb-glx_0.18.bb
+++ b/meta-emenlow/packages/xpsb-glx/xpsb-glx_0.18.bb
@@ -11,11 +11,14 @@ inherit autotools
11PROVIDES = "virtual/libgl mesa-dri" 11PROVIDES = "virtual/libgl mesa-dri"
12 12
13SRC_URI="https://launchpad.net/~gma500/+archive/ppa/+files/xpsb-glx_0.18-0ubuntu1netbook2~1004um1ubuntu1.tar.gz \ 13SRC_URI="https://launchpad.net/~gma500/+archive/ppa/+files/xpsb-glx_0.18-0ubuntu1netbook2~1004um1ubuntu1.tar.gz \
14 file://cross-compile.patch;patch=1 \ 14 file://cross-compile.patch \
15 file://libdrmname.patch;patch=1" 15 file://libdrmname.patch \
16 file://native-matypes.patch"
16 17
17do_configure () { 18do_configure () {
18 chmod +x autogen.sh && ./autogen.sh && make realclean 19 chmod +x autogen.sh && ./autogen.sh ${CONFIGUREOPTS} && make realclean
20 cd ${S}/src/mesa/x86/
21 ${BUILD_CC} -I../../../include/GL -I../../../include -I.. -I../main -I../math -I../glapi -I../tnl -Wall -Wmissing-prototypes -std=c99 -ffast-math -fPIC -D_POSIX_SOURCE -D_POSIX_C_SOURCE=199309L -D_SVID_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -DHAVE_POSIX_MEMALIGN -DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM -fno-strict-aliasing gen_matypes.c -o gen_matypes
19} 22}
20 23
21do_install() { 24do_install() {