Wed Jul 30 20:34:50 2014 UTC ()
Don't append LIBABISUFFIX to X11_LDFLAGS when using pkgsrc libX11.


(jperkin)
diff -r1.10 -r1.11 pkgsrc/x11/libX11/buildlink3.mk
cvs diff -r1.10 -r1.11 pkgsrc/x11/libX11/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/libX11/buildlink3.mk 2014/05/27 04:45:33 1.10
+++ pkgsrc/x11/libX11/buildlink3.mk 2014/07/30 20:34:50 1.11
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: buildlink3.mk,v 1.10 2014/05/27 04:45:33 rodent Exp $ 1# $NetBSD: buildlink3.mk,v 1.11 2014/07/30 20:34:50 jperkin 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
21X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib${LIBABISUFFIX} 21X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib
22 22
23.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD" 23.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD"
24.include "../../mk/pthread.buildlink3.mk" 24.include "../../mk/pthread.buildlink3.mk"
25.endif 25.endif
26 26
27.include "../../x11/kbproto/buildlink3.mk" 27.include "../../x11/kbproto/buildlink3.mk"
28.include "../../x11/libXau/buildlink3.mk" 28.include "../../x11/libXau/buildlink3.mk"
29.include "../../x11/libXdmcp/buildlink3.mk" 29.include "../../x11/libXdmcp/buildlink3.mk"
30 30
31.if ${X11_TYPE} == "modular" || \ 31.if ${X11_TYPE} == "modular" || \
32 exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \ 32 exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \
33 exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc) 33 exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc)
34.include "../../x11/libxcb/buildlink3.mk" 34.include "../../x11/libxcb/buildlink3.mk"