diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-18 12:59:47 -0300 |
| commit | 12c074375919d2de177eb9456352866902118a03 (patch) | |
| tree | 3f6b2e5baadedbc7901bf3e614fd017ca8aaee52 /testing/mesa | |
| parent | 598db82f25ffe3557e395a11f379de65af9e1ac1 (diff) | |
| parent | ddddf9c453076a407bfdbf3e030e606f31ee2b86 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/dopewars/PKGBUILD
community/virtualbox/PKGBUILD
core/lvm2/PKGBUILD
extra/aspell/PKGBUILD
extra/gnome-python-extras/PKGBUILD
extra/libproxy/PKGBUILD
extra/live-media/PKGBUILD
extra/ocaml/PKGBUILD
extra/putty/PKGBUILD
extra/python/PKGBUILD
extra/ruby/PKGBUILD
kde-unstable/calligra/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'testing/mesa')
| -rw-r--r-- | testing/mesa/linking_fix.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/testing/mesa/linking_fix.patch b/testing/mesa/linking_fix.patch new file mode 100644 index 000000000..34ed7902d --- /dev/null +++ b/testing/mesa/linking_fix.patch @@ -0,0 +1,22 @@ +From 5fe5d236c26b3b2428bc7395304e40cf21d3d3e1 Mon Sep 17 00:00:00 2001 +From: Chia-I Wu <olv@lunarg.com> +Date: Wed, 13 Jul 2011 07:25:46 +0000 +Subject: targets/egl-static: fix a linking error + +rbug is always linked in and it needs libpthread. +--- +diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile +index 832d7ba..69e7eec 100644 +--- a/src/gallium/targets/egl-static/Makefile ++++ b/src/gallium/targets/egl-static/Makefile +@@ -42,7 +42,7 @@ egl_CPPFLAGS += \ + -I$(TOP)/src/egl/main \ + -D_EGL_MAIN=_eglMain + egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a +-egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm ++egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread + + # EGL platforms + ifneq ($(findstring x11, $(EGL_PLATFORMS)),) +-- +cgit v0.8.3-6-g21f6 |