summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authorkientzle <kientzle@FreeBSD.org>2009-04-18 06:01:55 +0000
committerkientzle <kientzle@FreeBSD.org>2009-04-18 06:01:55 +0000
commit7d9a6f5de15af14ca25407bf1a077702cd55aac6 (patch)
tree04b109fe9a3d8561b83b8ca593e24ec3ca6229bb /rescue
parent1b4076a052efb7ea4906d26727ab49c4dee99059 (diff)
downloadFreeBSD-src-7d9a6f5de15af14ca25407bf1a077702cd55aac6.zip
FreeBSD-src-7d9a6f5de15af14ca25407bf1a077702cd55aac6.tar.gz
Libarchive is sprouting dependencies on libmd and libcrypto.
Because crunchgen drops any repeated library (keeping only the first), the -lcrypto reference must be moved to after -larchive, not merely duplicated. I'm considering changing crunchgen's handling of duplicate libraries, but that's a rather more delicate issue.
Diffstat (limited to 'rescue')
-rw-r--r--rescue/rescue/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 87af001..30a9d46 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -73,9 +73,6 @@ CRUNCH_PROGS_bin= cat chflags chio chmod cp date dd df echo \
ed expr getfacl hostname kenv kill ln ls mkdir mv \
pkill ps pwd realpath rm rmdir setfacl sh stty sync test
CRUNCH_LIBS+= -lcrypt -ledit -lkvm -ll -lm -ltermcap -lutil
-.if ${MK_OPENSSL} != "no"
-CRUNCH_LIBS+= -lcrypto
-.endif
# Additional options for specific programs
CRUNCH_ALIAS_test= [
@@ -201,7 +198,10 @@ CRUNCH_ALIAS_bzip2= bunzip2 bzcat
CRUNCH_LIBS+= -lbz2
CRUNCH_PROGS_usr.bin+= tar
-CRUNCH_LIBS+= -larchive
+CRUNCH_LIBS+= -larchive -lmd
+.if ${MK_OPENSSL} != "no"
+CRUNCH_LIBS+= -lcrypto
+.endif
CRUNCH_PROGS_usr.bin+= vi
CRUNCH_ALIAS_vi= ex
OpenPOWER on IntegriCloud