diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2017-03-20 11:12:31 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2017-03-20 11:12:31 +0000 |
| commit | 4a7f6834348e3853977e1b7d69ff44f6eb93313c (patch) | |
| tree | 27f68e9bbe812cb11d4094911825d437242a25d7 /cat | |
| parent | 086ca70a2894f87d7cd5ac72a6d891b00d5b4dc5 (diff) | |
| download | src-4a7f6834348e3853977e1b7d69ff44f6eb93313c.tar.gz src-4a7f6834348e3853977e1b7d69ff44f6eb93313c.zip | |
Update vendor/libarchive to git 5881c9021a85668bd945593f5ba43a0d22c53d71
Vendor changes (FreeBSD-related):
Break ACL read/write code into platform-specific source files
Vendor bugfixes (FreeBSD-related):
PR 867 (bsdcpio): show numeric uid/gid when names are not found
PR 870 (seekable zip): accept files with valid ZIP64 EOCD headers
PR 880 (pax): Fix handling of "size" pax header keyword
PR 887 (crypto): Discard 3072 bytes instead of 1024 of first keystream
OSS-Fuzz issue 806 (mtree): rework mtree_atol10 integer parser
Unbreak static dependency on libbz2
Notes
Notes:
svn path=/vendor/libarchive/dist/; revision=315633
Diffstat (limited to 'cat')
| -rw-r--r-- | cat/test/CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cat/test/CMakeLists.txt b/cat/test/CMakeLists.txt index 0623cc367227..0cd3aad84f49 100644 --- a/cat/test/CMakeLists.txt +++ b/cat/test/CMakeLists.txt @@ -30,9 +30,14 @@ IF(ENABLE_CAT AND ENABLE_TEST) # ADD_EXECUTABLE(bsdcat_test ${bsdcat_test_SOURCES}) IF(ENABLE_ACL) + SET(TEST_ACL_LIBS "") IF(HAVE_LIBACL) - TARGET_LINK_LIBRARIES(bsdcat_test ${ACL_LIBRARY}) + LIST(APPEND TEST_ACL_LIBS ${ACL_LIBRARY}) ENDIF(HAVE_LIBACL) + IF(HAVE_LIBRICHACL) + LIST(APPEND TEST_ACL_LIBS ${RICHACL_LIBRARY}) + ENDIF(HAVE_LIBRICHACL) + TARGET_LINK_LIBRARIES(bsdcat_test ${TEST_ACL_LIBS}) ENDIF(ENABLE_ACL) SET_PROPERTY(TARGET bsdcat_test PROPERTY COMPILE_DEFINITIONS LIST_H) |