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
cvs diff -r1.36 -r1.37 pkgsrc/x11/libX11/Makefile (expand / switch to unified diff)

--- 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.36 2014/04/29 10:27:33 obache Exp $ 1# $NetBSD: Makefile,v 1.37 2014/05/27 04:45:33 rodent Exp $
2 2
3DISTNAME= libX11-1.6.2 3DISTNAME= libX11-1.6.2
4CATEGORIES= x11 devel 4CATEGORIES= x11 devel
5MASTER_SITES= ${MASTER_SITE_XORG:=lib/} 5MASTER_SITES= ${MASTER_SITE_XORG:=lib/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= joerg@NetBSD.org 8MAINTAINER= joerg@NetBSD.org
9HOMEPAGE= http://xorg.freedesktop.org/ 9HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= Base X libraries from modular Xorg X11 10COMMENT= Base X libraries from modular Xorg X11
11LICENSE= mit 11LICENSE= mit
12 12
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
@@ -19,29 +19,31 @@ USE_TOOLS+= gmake pkg-config @@ -19,29 +19,31 @@ USE_TOOLS+= gmake pkg-config
19CONFIGURE_ARGS+= --enable-man-pages=3 19CONFIGURE_ARGS+= --enable-man-pages=3
20CONFIGURE_ARGS+= --with-xcb 20CONFIGURE_ARGS+= --with-xcb
21CONFIGURE_ARGS+= --disable-specs 21CONFIGURE_ARGS+= --disable-specs
22PKGCONFIG_OVERRIDE+= x11.pc.in 22PKGCONFIG_OVERRIDE+= x11.pc.in
23 23
24CONFIGURE_ENV+= FILE_MAN_SUFFIX=5 24CONFIGURE_ENV+= FILE_MAN_SUFFIX=5
25 25
26.include "../../mk/bsd.prefs.mk" 26.include "../../mk/bsd.prefs.mk"
27 27
28.if ${OPSYS} == "NetBSD" 28.if ${OPSYS} == "NetBSD"
29CONFIGURE_ARGS+= --disable-malloc0returnsnull 29CONFIGURE_ARGS+= --disable-malloc0returnsnull
30.endif 30.endif
31 31
32CPPFLAGS.OSF1+= -pthread # Required by compiler if including pthread.h 32.include "../../mk/pthread.buildlink3.mk"
33CPPFLAGS.MirBSD+= -pthread 33CPPFLAGS.OSF1+= ${PTHREAD_CFLAGS} # Required by compiler if including pthread.h
34LDFLAGS.MirBSD+= -pthread 34CPPFLAGS.MirBSD+= ${PTHREAD_CFLAGS}
 35LDFLAGS.MirBSD+= ${PTHREAD_LDFLAGS}
 36LDFLAGS.OpenBSD+= ${PTHREAD_LDFLAGS}
35 37
36BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1 38BUILDLINK_API_DEPENDS.libxcb+=libxcb>=1.8.1
37BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17 39BUILDLINK_API_DEPENDS.xproto+=xproto>=7.0.17
38 40
39TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp 41TOOL_DEPENDS+= tradcpp-[0-9]*:../../devel/tradcpp
40CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix" 42CONFIGURE_ENV+= ac_cv_path_RAWCPP="${PREFIX}/bin/tradcpp -Uunix"
41 43
42.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) 44.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
43CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q} 45CONFIGURE_ENV+= CC_FOR_BUILD=${NATIVE_CC:Q}
44 46
45# XXX This needs to match the version of xcb-proto we get for the 47# XXX This needs to match the version of xcb-proto we get for the
46# target by buildlink3. 48# target by buildlink3.
47TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto 49TOOL_DEPENDS+= xproto-[0-9]*:../../x11/xproto
cvs diff -r1.9 -r1.10 pkgsrc/x11/libX11/buildlink3.mk (expand / switch to unified diff)

--- 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,35 +1,39 @@ @@ -1,35 +1,39 @@
1# $NetBSD: buildlink3.mk,v 1.9 2014/03/10 11:05:52 jperkin Exp $ 1# $NetBSD: buildlink3.mk,v 1.10 2014/05/27 04:45:33 rodent Exp $
2 2
3.include "../../mk/bsd.fast.prefs.mk" 3.include "../../mk/bsd.fast.prefs.mk"
4 4
5.if ${X11_TYPE} != "modular" && \ 5.if ${X11_TYPE} != "modular" && \
6 !exists(${X11BASE}/lib/pkgconfig/x11.pc) && \ 6 !exists(${X11BASE}/lib/pkgconfig/x11.pc) && \
7 !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc) 7 !exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/x11.pc)
8.include "../../mk/x11.buildlink3.mk" 8.include "../../mk/x11.buildlink3.mk"
9.else 9.else
10 10
11BUILDLINK_TREE+= libX11 11BUILDLINK_TREE+= libX11
12 12
13.if !defined(LIBX11_BUILDLINK3_MK) 13.if !defined(LIBX11_BUILDLINK3_MK)
14LIBX11_BUILDLINK3_MK:= 14LIBX11_BUILDLINK3_MK:=
15 15
16BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1 16BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1
17BUILDLINK_ABI_DEPENDS.libX11+= libX11>=0.99 17BUILDLINK_ABI_DEPENDS.libX11+= libX11>=0.99
18BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11 18BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11
19 19
20X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX} 20X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX}
21X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX} 21X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX}
22 22
 23.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD"
 24.include "../../mk/pthread.buildlink3.mk"
 25.endif
 26
23.include "../../x11/kbproto/buildlink3.mk" 27.include "../../x11/kbproto/buildlink3.mk"
24.include "../../x11/libXau/buildlink3.mk" 28.include "../../x11/libXau/buildlink3.mk"
25.include "../../x11/libXdmcp/buildlink3.mk" 29.include "../../x11/libXdmcp/buildlink3.mk"
26 30
27.if ${X11_TYPE} == "modular" || \ 31.if ${X11_TYPE} == "modular" || \
28 exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \ 32 exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \
29 exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc) 33 exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc)
30.include "../../x11/libxcb/buildlink3.mk" 34.include "../../x11/libxcb/buildlink3.mk"
31.endif 35.endif
32 36
33.include "../../x11/xproto/buildlink3.mk" 37.include "../../x11/xproto/buildlink3.mk"
34.endif # LIBX11_BUILDLINK3_MK 38.endif # LIBX11_BUILDLINK3_MK
35 39