From 8a6c4db3639647150c42612d748a6d47ad5769bc Mon Sep 17 00:00:00 2001 From: rodent Date: Tue, 27 May 2014 04:45:33 +0000 Subject: libXext build failure on OpenBSD exposed libX11 test failing during configure due to missing pthread library. Buildlink pthread. Don't hardcode -pthread for OSF1, MirBSD, and OpenBSD, but use PTHREAD_{C,LD}FLAGS instead. Add pthread in bl3, but for the above targets. --- x11/libX11/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'x11/libX11/Makefile') diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 3fe3d8edd4e..d7447bc1d77 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2014/04/29 10:27:33 obache Exp $ +# $NetBSD: Makefile,v 1.37 2014/05/27 04:45:33 rodent Exp $ DISTNAME= libX11-1.6.2 CATEGORIES= x11 devel @@ -29,9 +29,11 @@ CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 CONFIGURE_ARGS+= --disable-malloc0returnsnull .endif -CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h -CPPFLAGS.MirBSD+= -pthread -LDFLAGS.MirBSD+= -pthread +.include "../../mk/pthread.buildlink3.mk" +CPPFLAGS.OSF1+= ${PTHREAD_CFLAGS} # Required by compiler if including pthread.h +CPPFLAGS.MirBSD+= ${PTHREAD_CFLAGS} +LDFLAGS.MirBSD+= ${PTHREAD_LDFLAGS} +LDFLAGS.OpenBSD+= ${PTHREAD_LDFLAGS} BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1 BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17 -- cgit v1.2.3