| 1 |
From 6a934ff6638352b2c28cf5a7452fed2f32853c17 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Anssi Hannula <anssi.hannula@iki.fi> |
| 3 |
Date: Sun, 5 Aug 2012 00:47:06 +0300 |
| 4 |
Subject: [PATCH] Fix undefined symbols in libOSMesa and libglapi |
| 5 |
|
| 6 |
--- |
| 7 |
src/mapi/shared-glapi/Makefile.am | 2 +- |
| 8 |
src/mesa/Makefile.am | 2 +- |
| 9 |
src/mesa/drivers/osmesa/Makefile.am | 6 ++++++ |
| 10 |
3 files changed, 8 insertions(+), 2 deletions(-) |
| 11 |
|
| 12 |
diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am |
| 13 |
index 8db7688..8d41db2 100644 |
| 14 |
--- a/src/mapi/shared-glapi/Makefile.am |
| 15 |
+++ b/src/mapi/shared-glapi/Makefile.am |
| 16 |
@@ -6,7 +6,7 @@ include $(top_srcdir)/src/mapi/mapi/sources.mak |
| 17 |
|
| 18 |
lib_LTLIBRARIES = libglapi.la |
| 19 |
libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) |
| 20 |
-libglapi_la_LDFLAGS = -no-undefined |
| 21 |
+libglapi_la_LDFLAGS = -no-undefined -pthread |
| 22 |
|
| 23 |
include $(GLAPI)/gen/glapi_gen.mk |
| 24 |
glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps) |
| 25 |
diff --git a/src/mesa/Makefile.am b/src/mesa/Makefile.am |
| 26 |
index bb70ed6..82b2f36 100644 |
| 27 |
--- a/src/mesa/Makefile.am |
| 28 |
+++ b/src/mesa/Makefile.am |
| 29 |
@@ -120,7 +120,7 @@ libmesa_la_SOURCES = \ |
| 30 |
$(MESA_CXX_FILES) \ |
| 31 |
$(MESA_ASM_FILES_FOR_ARCH) |
| 32 |
|
| 33 |
-libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la |
| 34 |
+libmesa_la_LIBADD = $(top_builddir)/src/glsl/libglsl.la -ldl |
| 35 |
libmesa_la_LDFLAGS = |
| 36 |
|
| 37 |
libmesagallium_la_SOURCES = \ |
| 38 |
diff --git a/src/mesa/drivers/osmesa/Makefile.am b/src/mesa/drivers/osmesa/Makefile.am |
| 39 |
index dbee925..5a1d88e 100644 |
| 40 |
--- a/src/mesa/drivers/osmesa/Makefile.am |
| 41 |
+++ b/src/mesa/drivers/osmesa/Makefile.am |
| 42 |
@@ -39,6 +39,12 @@ |
| 43 |
lib@OSMESA_LIB@_la_LIBADD = \ |
| 44 |
$(top_builddir)/src/mesa/libmesa.la \ |
| 45 |
$(top_builddir)/src/mapi/glapi/libglapi.la |
| 46 |
+lib@OSMESA_LIB@_la_LIBTOOLFLAGS = --tag=CXX |
| 47 |
+ |
| 48 |
+if HAVE_SHARED_GLAPI |
| 49 |
+lib@OSMESA_LIB@_la_LDFLAGS += -L$(top_builddir)/$(LIB_DIR) |
| 50 |
+lib@OSMESA_LIB@_la_LIBADD += -lglapi |
| 51 |
+endif |
| 52 |
|
| 53 |
if BUILD_SHARED |
| 54 |
# Provide compatibility with scripts for the old Mesa build system for |
| 55 |
-- |
| 56 |
1.7.10 |
| 57 |
|
Parent Directory
| 
Revision Log