diff options
| author | dim <dim@FreeBSD.org> | 2014-08-04 14:56:49 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-08-04 14:56:49 +0000 |
| commit | bde3467611213433dffde86fe37fa1ba8c021b09 (patch) | |
| tree | 51a8ea81ae3bbfc3041a6a73b85efbe52e7971a1 /rescue | |
| parent | 1cf61633491d02d7751c8ac8624258b12a26967c (diff) | |
| download | FreeBSD-src-bde3467611213433dffde86fe37fa1ba8c021b09.zip FreeBSD-src-bde3467611213433dffde86fe37fa1ba8c021b09.tar.gz | |
MFC r269125:
In r232153, libarchive 3.0.3 was imported, replacing the archive_hash.h
header with archive_crypto_private.h, and its ARCHIVE_HASH_xxx macros
were renamed to ARCHIVE_CRYPTO_xxx.
Rename these macros in lib/libarchive/config_freebsd.h, to re-enable the
hashes for libarchive again. This affects the mtree format writer, and
the xar format reader and writer modules.
This also requires changes in the library order for statically linking
rescue, otherwise ld would complain about redefined symbols. Thanks to
jkim for pointing out the solution.
Reviewed by: kientzle
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 8e6afc8..297cd81 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -125,7 +125,11 @@ CRUNCH_LIBS+= -lipx .if ${MK_ZFS} != "no" CRUNCH_LIBS+= -lavl -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem .endif -CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lsbuf -lufs -lz +CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv +.if ${MK_OPENSSL} == "no" +CRUNCH_LIBS+= -lmd +.endif +CRUNCH_LIBS+= -lsbuf -lufs -lz .if ${MACHINE_CPUARCH} == "i386" CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk @@ -194,10 +198,11 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat CRUNCH_LIBS+= -llzma CRUNCH_PROGS_usr.bin+= tar -CRUNCH_LIBS+= -larchive -lmd +CRUNCH_LIBS+= -larchive .if ${MK_OPENSSL} != "no" CRUNCH_LIBS+= -lcrypto .endif +CRUNCH_LIBS+= -lmd CRUNCH_PROGS_usr.bin+= vi CRUNCH_ALIAS_vi= ex |
