Tue May 27 04:45:33 2014 UTC ()
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.
(rodent)
diff -r1.36 -r1.37 pkgsrc/x11/libX11/Makefile
diff -r1.9 -r1.10 pkgsrc/x11/libX11/buildlink3.mk
--- pkgsrc/x11/libX11/Makefile 2014/04/29 10:27:33 1.36
+++ pkgsrc/x11/libX11/Makefile 2014/05/27 04:45:33 1.37
@@ -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_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
--- pkgsrc/x11/libX11/buildlink3.mk 2014/03/10 11:05:52 1.9
+++ pkgsrc/x11/libX11/buildlink3.mk 2014/05/27 04:45:33 1.10
@@ -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"
@@ -19,6 +19,10 @@
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"