diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-10-11 22:44:25 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-11 22:44:25 +0100 |
| commit | 6b53fbcc205346be60ea0a8e01c7cb0bbeeba55a (patch) | |
| tree | 355fe49ea083f6db8605e9ce424485e8b40ab138 /meta-emenlow | |
| parent | 364aaa6dfa706a6fe4afc85b5688a02daab75b26 (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'meta-emenlow')
| -rw-r--r-- | meta-emenlow/packages/xpsb-glx/xpsb-glx-0.18/native-matypes.patch | 20 | ||||
| -rw-r--r-- | meta-emenlow/packages/xpsb-glx/xpsb-glx_0.18.bb | 9 |
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 @@ +Index: mesa/src/mesa/x86/Makefile +=================================================================== +--- mesa.orig/src/mesa/x86/Makefile 2010-10-11 16:34:12.664960996 +0100 ++++ mesa/src/mesa/x86/Makefile 2010-10-11 16:34:43.854960861 +0100 +@@ -20,11 +20,12 @@ + -rm -f matypes.h gen_matypes + + +-gen_matypes: gen_matypes.c +- $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes ++#gen_matypes: gen_matypes.c ++# $(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes + + # need some special rules here, unfortunately +-matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes ++matypes.h: ../main/mtypes.h ../tnl/t_context.h ++# gen_matypes + ./gen_matypes > matypes.h + + 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 PROVIDES = "virtual/libgl mesa-dri" SRC_URI="https://launchpad.net/~gma500/+archive/ppa/+files/xpsb-glx_0.18-0ubuntu1netbook2~1004um1ubuntu1.tar.gz \ - file://cross-compile.patch;patch=1 \ - file://libdrmname.patch;patch=1" + file://cross-compile.patch \ + file://libdrmname.patch \ + file://native-matypes.patch" do_configure () { - chmod +x autogen.sh && ./autogen.sh && make realclean + chmod +x autogen.sh && ./autogen.sh ${CONFIGUREOPTS} && make realclean + cd ${S}/src/mesa/x86/ + ${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 } do_install() { |