d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Libarchive is sprouting dependencies on libmd and libcrypto.

Browse Source 
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:
Tim Kientzle 2009-04-18 06:01:55 +00:00
parent 77944b3551
commit 3b495423e3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rescue/rescue/Makefile
View File

@ -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