Mesa (9.0): build: Link libglapi with pthreads
Ian Romanick
idr at kemper.freedesktop.org
Fri Sep 28 23:05:37 UTC 2012
Module: Mesa
Branch: 9.0
Commit: cb84fe5e1003262eea058990777c82e8e25a0639
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cb84fe5e1003262eea058990777c82e8e25a0639
Author: Matt Turner <mattst88 at gmail.com>
Date: Tue Sep 18 20:22:37 2012 -0700
build: Link libglapi with pthreads
NOTE: This is a candidate for the 9.0 branch.
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=839060
https://bugs.gentoo.org/show_bug.cgi?id=435152
Reviewed-by: Adam Jackson <ajax at redhat.com>
(cherry picked from commit 9ed00075d8ea0ffaa675237e32b8611ad3064dbf)
---
configure.ac | 5 +----
src/mapi/shared-glapi/Makefile.am | 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1724df0..5dfc2fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -524,6 +524,7 @@ if test "x$enable_selinux" = "xyes"; then
SELINUX_LIBS="-lselinux"
DEFINES="$DEFINES -DMESA_SELINUX"
fi
+AC_SUBST([SELINUX_LIBS])
dnl Options for APIs
AC_ARG_ENABLE([opengl],
@@ -917,10 +918,6 @@ AC_SUBST([GLESv1_CM_PC_LIB_PRIV])
AC_SUBST([GLESv2_LIB_DEPS])
AC_SUBST([GLESv2_PC_LIB_PRIV])
-GLAPI_LIB_DEPS="-lpthread $SELINUX_LIBS"
-AC_SUBST([GLAPI_LIB_DEPS])
-
-
DRI_LIB_DEPS="\$(top_builddir)/src/mesa/libdricore/libdricore${VERSION}.la"
GALLIUM_DRI_LIB_DEPS="\$(TOP)/\$(LIB_DIR)/libdricore${VERSION}.so"
diff --git a/src/mapi/shared-glapi/Makefile.am b/src/mapi/shared-glapi/Makefile.am
index 8db7688..d215c43 100644
--- a/src/mapi/shared-glapi/Makefile.am
+++ b/src/mapi/shared-glapi/Makefile.am
@@ -6,6 +6,7 @@ include $(top_srcdir)/src/mapi/mapi/sources.mak
lib_LTLIBRARIES = libglapi.la
libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)
+libglapi_la_LIBADD = $(PTHREAD_LIBS) $(SELINUX_LIBS)
libglapi_la_LDFLAGS = -no-undefined
include $(GLAPI)/gen/glapi_gen.mk
@@ -15,6 +16,7 @@ glapi_mapi_tmp.h : $(GLAPI)/gen/gl_and_es_API.xml $(glapi_gen_mapi_deps)
BUILT_SOURCES = glapi_mapi_tmp.h
CLEANFILES = $(BUILT_SOURCES)
+AM_CFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS = \
$(DEFINES) \
-I$(top_srcdir)/include \
More information about the mesa-commit
mailing list