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@redhat.com>
This commit is contained in:
+1
-4
@@ -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],
|
||||
@@ -920,10 +921,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"
|
||||
|
||||
AC_SUBST([HAVE_XF86VIDMODE])
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user