diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2012-11-11 12:09:10 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2012-11-11 12:09:10 +0000 |
| commit | a2f9e4985e2f3317cf670556692f4265a7bc60f7 (patch) | |
| tree | 18d078dde7294bf53d8066f75c775157806253cf | |
| parent | 8824b7933ffd2c64df488bb078a9ca1dc6677170 (diff) | |
Link libGL with -lpthread to allow the llvm-pipe driver to be loaded.
ok matthieu@, ajacoutot@
| -rw-r--r-- | lib/libGL/Makefile | 4 | ||||
| -rw-r--r-- | lib/libGL/dri/swrastg/Makefile | 6 | ||||
| -rw-r--r-- | lib/libGL/gallium/Makefile.inc | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/libGL/Makefile b/lib/libGL/Makefile index f2616fcb0..397643d90 100644 --- a/lib/libGL/Makefile +++ b/lib/libGL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2012/08/26 18:46:42 mpi Exp $ +# $OpenBSD: Makefile,v 1.33 2012/11/11 12:09:09 mpi Exp $ .include <bsd.xconf.mk> .if ${XENOCARA_BUILD_DRI:L} == "yes" @@ -27,6 +27,8 @@ INCSDIR= ${X11BASE}/include/GL .if ${XENOCARA_BUILD_DRI:L} == "yes" LDADD= -L${X11BASE}/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -ldrm -lstdc++ -lm -lc +# XXX link libGL with -lpthread to be able to dlopen() the llvm-pipe module +LDADD+= -lpthread .else LDADD= -L${X11BASE}/lib -lX11 -lXext .endif diff --git a/lib/libGL/dri/swrastg/Makefile b/lib/libGL/dri/swrastg/Makefile index c718e25ec..4b1b67784 100644 --- a/lib/libGL/dri/swrastg/Makefile +++ b/lib/libGL/dri/swrastg/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.4 2012/08/26 18:46:42 mpi Exp $ +# $OpenBSD: Makefile,v 1.5 2012/11/11 12:09:09 mpi Exp $ -LIB= swrast_dri.so +LIB= swrastg_dri.so GALLIUM= ${.CURDIR}/../../../../dist/Mesa/src/gallium @@ -41,7 +41,7 @@ LDADD= ../../mesa/libmesagallium/libmesagallium_pic.a \ ../../glsl/libglsl/libglsl_pic.a \ ${DRIVER_LIBS} \ ../../gallium/libgallium/libgallium_pic.a \ - -L${X11BASE}/lib -lexpat -lm -lstdc++ -lc -lpthread + -L${X11BASE}/lib -lexpat -lm -lstdc++ -lc DPADD= ../../mesa/libmesagallium/libmesagallium_pic.a .include "../../gallium/Makefile.inc" diff --git a/lib/libGL/gallium/Makefile.inc b/lib/libGL/gallium/Makefile.inc index f17179f46..7a9ac5829 100644 --- a/lib/libGL/gallium/Makefile.inc +++ b/lib/libGL/gallium/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.1 2012/07/13 12:43:30 mpi Exp $ +# $OpenBSD: Makefile.inc,v 1.2 2012/11/11 12:09:09 mpi Exp $ CPP= cpp -notraditional @@ -31,12 +31,12 @@ LLVM_CONFIG?= /usr/local/bin/llvm-config LLVM_CFLAGS!= ${LLVM_CONFIG} --cflags LLVM_CPPFLAGS!= ${LLVM_CONFIG} --cxxflags -LLVM_LDFLAGS!= ${LLVM_CONFIG} --ldflags +LLVM_LIBDIR!= ${LLVM_CONFIG} --libdir LLVM_LIBS!= ${LLVM_CONFIG} --libs engine CFLAGS+= ${LLVM_CFLAGS} -std=gnu99 CXXFLAGS= ${LLVM_CPPFLAGS} -LDADD+= ${LLVM_LDFLAGS} ${LLVM_LIBS} +LDADD+= -L${LLVM_LIBDIR} ${LLVM_LIBS} CPPFLAGS+= \ -DGALLIUM_LLVMPIPE \ |