Author: kientzle
Date: Sat Apr 18 06:01:55 2009
New Revision: 191239
URL: http://svn.freebsd.org/changeset/base/191239
Log:
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.
Modified:
head/rescue/rescue/Makefile
Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile Sat Apr 18 04:45:02 2009 (r191238)
+++ head/rescue/rescue/Makefile Sat Apr 18 06:01:55 2009 (r191239)
@@ -73,9 +73,6 @@ CRUNCH_PROGS_bin= cat chflags chio chmod
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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
