diff options
| author | rodent <rodent@pkgsrc.org> | 2014-05-27 04:45:33 +0000 |
|---|---|---|
| committer | rodent <rodent@pkgsrc.org> | 2014-05-27 04:45:33 +0000 |
| commit | 693076730eec521b6143c202ae693ce11ef830c0 (patch) | |
| tree | c9a9b25dfc01bd3b8f1003246754790f72f48363 /x11 | |
| parent | 162dd3ffb3a3096d64906679a6b886910ba11bc6 (diff) | |
| download | pkgsrc-693076730eec521b6143c202ae693ce11ef830c0.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/libX11/Makefile | 10 | ||||
| -rw-r--r-- | x11/libX11/buildlink3.mk | 6 |
2 files changed, 11 insertions, 5 deletions
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 diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index e0e35562fd0..f73cb659fd7 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2014/05/27 04:45:33 rodent Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -20,6 +20,10 @@ BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11 X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX} X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX} +.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD" +.include "../../mk/pthread.buildlink3.mk" +.endif + .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" |