diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-02-03 14:35:51 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-07 16:52:41 +0000 |
| commit | 4816a02db45be5e857341fa989e3df6095813b42 (patch) | |
| tree | 0cb0d7073eb438d48001e83a95a3bf6dd566a59a /meta/recipes-graphics/mesa | |
| parent | d372eadfd3d7105a85b4d227c52538ab4ec3b2eb (diff) | |
| download | openembedded-core-4816a02db45be5e857341fa989e3df6095813b42.tar.gz openembedded-core-4816a02db45be5e857341fa989e3df6095813b42.tar.bz2 openembedded-core-4816a02db45be5e857341fa989e3df6095813b42.zip | |
mesa-demos: fix build issue with gcc dso linking change
All the libraries needs to be specified explicitely with the new gcc dso
linking change patch. This was causing build errors for this
recipe. Specifying the libpthread library explicitely for linking to work
without errors.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-graphics/mesa')
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/dso_linking_change_build_fix.patch | 23 | ||||
| -rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb | 5 |
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 @@ +after gcc linking has changed, all the libraries must be explicitely specified +This patch avoids these linking errors: + +| CCLD xeglgears +| /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' +| /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 +| /build_disk/poky_build/build0/tmp/sysroots/qemuarm/lib/libpthread.so.0: could not read symbols: Invalid operation +| collect2: ld returned 1 exit status + + +Nitin A Kamble <nitin.a.kamble@intel.com> +Date: 2011/02/03 + + +Index: mesa-demos-8.0.1/src/egl/opengl/Makefile.am +=================================================================== +--- mesa-demos-8.0.1.orig/src/egl/opengl/Makefile.am 2010-07-07 10:57:15.000000000 -0700 ++++ mesa-demos-8.0.1/src/egl/opengl/Makefile.am 2011-02-03 14:30:13.928486381 -0800 +@@ -67,3 +67,4 @@ + + eglgears_x11_LDADD = ../eglut/libeglut_x11.la + egltri_x11_LDADD = ../eglut/libeglut_x11.la ++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 DEPENDS = "virtual/libx11 virtual/libgl glew" -PR = "r0" +PR = "r1" -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2" +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${PN}-${PV}.tar.bz2 \ + file://dso_linking_change_build_fix.patch" inherit autotools pkgconfig |