summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch23
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb5
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch b/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
new file mode 100644
index 0000000000..aa2faf9d13
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch
@@ -0,0 +1,23 @@
1after gcc linking has changed, all the libraries must be explicitely specified
2This patch avoids these linking errors:
3
4| CCLD xeglgears
5| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.5.1/ld: xeglthreads.o: undefined reference to symbol 'pthread_join@@GLIBC_2.4'
6| /build_disk/poky_build/build0/tmp/sysroots/x86_64-linux/usr/libexec/armv5te-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.5.1/ld: note: 'pthread_join@@GLIBC_2.4' is defined in DSO /build_disk/poky_build/build0/tmp/sysroots/qemuarm/lib/libpthread.so.0 so try adding it to the linker command line
7| /build_disk/poky_build/build0/tmp/sysroots/qemuarm/lib/libpthread.so.0: could not read symbols: Invalid operation
8| collect2: ld returned 1 exit status
9
10
11Nitin A Kamble <nitin.a.kamble@intel.com>
12Date: 2011/02/03
13
14
15Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am
16===================================================================
17--- mesa-demos-8.0.1.orig/src/egl/opengl/Makefile.am 2010-07-07 10:57:15.000000000 -0700
18+++ mesa-demos-8.0.1/src/egl/opengl/Makefile.am 2011-02-03 14:30:13.928486381 -0800
19@@ -67,3 +67,4 @@
20
21 eglgears_x11_LDADD = ../eglut/libeglut_x11.la
22 egltri_x11_LDADD = ../eglut/libeglut_x11.la
23+xeglthreads_LDADD = -lpthread
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
index e3a84beb19..504a8b7009 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
@@ -11,9 +11,10 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
11 11
12DEPENDS = "virtual/libx11 virtual/libgl glew" 12DEPENDS = "virtual/libx11 virtual/libgl glew"
13 13
14PR = "r0" 14PR = "r1"
15 15
16SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2" 16SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2 \
17 file://dso_linking_change_build_fix.patch"
17 18
18inherit autotools pkgconfig 19inherit autotools pkgconfig
19 20