Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
44b850b
)
Fix portability for systems which don't have dlopen or libarchive
author
Theodore Ts'o
<tytso@mit.edu>
Thu, 5 Dec 2024 03:08:46 +0000
(22:08 -0500)
committer
Theodore Ts'o
<tytso@mit.edu>
Thu, 5 Dec 2024 03:17:40 +0000
(22:17 -0500)
Fixes:
ecfd4dd1217a
("Decouple --without-libarchive and HAVE_ARCHIVE_H")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
misc/create_inode_libarchive.c
patch
|
blob
|
history
diff --git
a/misc/create_inode_libarchive.c
b/misc/create_inode_libarchive.c
index
d094d13
..
8a0fec3
100644
(file)
--- a/
misc/create_inode_libarchive.c
+++ b/
misc/create_inode_libarchive.c
@@
-17,7
+17,8
@@
#include "create_inode_libarchive.h"
#include "support/nls-enable.h"
-#ifdef CONFIG_DISABLE_LIBARCHIVE
+#if (!(defined(CONFIG_DLOPEN_LIBARCHIVE) || defined(HAVE_ARCHIVE_H)) || \
+ defined(CONFIG_DIABLE_LIBARCHIVE))
/* If ./configure was run with --without-libarchive, then only
* __populate_fs_from_tar() remains in this file and will return an error. */