Fri Nov 5 09:09:01 2010 UTC ()
New pkg_install requires -llzma, so to support static linking, be
explicit about what libraries are required, and not only depend on
shared library inter-dependencies to pull that in.
Fixes the build for sun2.


(he)
diff -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/Makefile.inc
cvs diff -r1.2 -r1.3 src/external/bsd/pkg_install/sbin/Makefile.inc (expand / switch to unified diff)

--- src/external/bsd/pkg_install/sbin/Makefile.inc 2009/02/02 20:47:21 1.2
+++ src/external/bsd/pkg_install/sbin/Makefile.inc 2010/11/05 09:09:01 1.3
@@ -1,22 +1,25 @@ @@ -1,22 +1,25 @@
1# $NetBSD: Makefile.inc,v 1.2 2009/02/02 20:47:21 joerg Exp $ 1# $NetBSD: Makefile.inc,v 1.3 2010/11/05 09:09:01 he Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5.include "${.PARSEDIR}/../Makefile.inc" 5.include "${.PARSEDIR}/../Makefile.inc"
6 6
7LIBINSTALL != cd ${.PARSEDIR}/../lib && ${PRINTOBJDIR} 7LIBINSTALL != cd ${.PARSEDIR}/../lib && ${PRINTOBJDIR}
8 8
9BINDIR?= /usr/sbin 9BINDIR?= /usr/sbin
10CPPFLAGS+= -DBINDIR='"${BINDIR}"' 10CPPFLAGS+= -DBINDIR='"${BINDIR}"'
11 11
12DPADD+= ${LIBINSTALL}/libinstall.a 12DPADD+= ${LIBINSTALL}/libinstall.a
13LDADD+= -L${LIBINSTALL} -linstall -ltermcap 13LDADD+= -L${LIBINSTALL} -linstall -ltermcap
14 14
15DPADD+= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO} 15DPADD+= ${LIBFETCH} ${LIBSSL} ${LIBCRYPTO}
16LDADD+= -lfetch -lssl -lcrypto 16LDADD+= -lfetch -lssl -lcrypto
17 17
18DPADD+= ${LIBARCHIVE} 18DPADD+= ${LIBARCHIVE}
19LDADD+= -larchive 19LDADD+= -larchive
20 20
21DPADD+= ${LIBZ} ${LIBBZ2} 21DPADD+= ${LIBZ} ${LIBBZ2}
22LDADD+= -lz -lbz2 22LDADD+= -lz -lbz2
 23
 24DPADD+= ${LIBLZMA}
 25LDADD+= -llzma