From 3b495423e3a15d894814a8408c7f98bc19f0996a Mon Sep 17 00:00:00 2001 From: Tim Kientzle Date: Sat, 18 Apr 2009 06:01:55 +0000 Subject: [PATCH] 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. --- rescue/rescue/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 87af001565df..30a9d466734a 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