mirror of
https://git.FreeBSD.org/src.git
synced 2024-11-26 07:55:01 +00:00
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.
This commit is contained in:
parent
77944b3551
commit
3b495423e3
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=191239
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user