From 422d8988cb49f5cff43d004132ee7d793993e7bd Mon Sep 17 00:00:00 2001 From: mrg Date: Fri, 17 Apr 2015 22:17:23 +0000 Subject: [PATCH] xz/lib depends upon pthread so move it to the 1st dependancy point. libarchive/lib depends upon xz, so move to the 2nd. --- lib/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 8e61a6e0ac19..61d0ae8d3698 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.220 2015/01/25 15:47:36 christos Exp $ +# $NetBSD: Makefile,v 1.221 2015/04/17 22:17:23 mrg Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include @@ -67,7 +67,6 @@ SUBDIR+= libbpfjit SUBDIR+= ../external/mit/expat/lib SUBDIR+= ../external/public-domain/sqlite/lib -SUBDIR+= ../external/public-domain/xz/lib SUBDIR+= ../gnu/lib/libmalloc @@ -91,6 +90,8 @@ SUBDIR+= ../external/lgpl3/mpc/lib/libmpc #==================== 1st library dependency barrier ==================== SUBDIR+= .WAIT +SUBDIR+= ../external/public-domain/xz/lib # depends on libpthread + .if (${MKCRYPTO} != "no") SUBDIR+= ../crypto/external/bsd/netpgp/libmj SUBDIR+= ../crypto/external/bsd/netpgp/lib/verify # depends on libz @@ -126,8 +127,6 @@ SUBDIR+= ../external/bsd/file/lib # depends on libz SUBDIR+= ../external/bsd/iscsi/lib # depends on libpthread .endif -SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz - .if (${MKLVM} != "no") SUBDIR+= ../external/gpl2/lvm2/lib # depends on libprop .endif @@ -152,6 +151,8 @@ SUBDIR+= ${SANITIZER_DIR} #==================== 2nd library dependency barrier ==================== SUBDIR+= .WAIT +SUBDIR+= ../external/bsd/libarchive/lib # depends on libxz + .if (${MKNPF} != "no") SUBDIR+= npf # depends on libnpf .endif