Remove liblzmadec remnants (#2436)

It looks like support for this library was removed in 2016, but we still
had some unused cmake code and a dead preprocessor block.

(cherry picked from commit 819a50a0436531276e388fc97eb0b1b61d2134a3)

diff --git a/build/cmake/config.h.in b/build/cmake/config.h.in
index 9a9ce52e6d31d1405b3f2dd3692306ccbf928c5d..1f6b0c2122317f371e0d196acd185cc43f34895c 100644 (file)
--- a/build/cmake/config.h.in
+++ b/build/cmake/config.h.in
@@ -735,9 +735,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the `lzma' library (-llzma). */
 #cmakedefine HAVE_LIBLZMA 1
 
-/* Define to 1 if you have the `lzmadec' library (-llzmadec). */
-#cmakedefine HAVE_LIBLZMADEC 1
-
 /* Define to 1 if you have the `lzo2' library (-llzo2). */
 #cmakedefine HAVE_LIBLZO2 1
 
@@ -847,9 +844,6 @@ typedef uint64_t uintmax_t;
 /* Define to 1 if you have the <lz4.h> header file. */
 #cmakedefine HAVE_LZ4_H 1
 
-/* Define to 1 if you have the <lzmadec.h> header file. */
-#cmakedefine HAVE_LZMADEC_H 1
-
 /* Define to 1 if you have the <lzma.h> header file. */
 #cmakedefine HAVE_LZMA_H 1
 

diff --git a/contrib/android/config/windows_host.h b/contrib/android/config/windows_host.h
index da821cc04a6d1f264e3a3ebe4ab3fc5fb7f098b1..4754744d8457d70fbe74de39c247ff30097636f4 100644 (file)
--- a/contrib/android/config/windows_host.h
+++ b/contrib/android/config/windows_host.h
@@ -530,9 +530,6 @@
 /* Define to 1 if you have the <lz4.h> header file. */
 /* #undef HAVE_LZ4_H */
 
-/* Define to 1 if you have the <lzmadec.h> header file. */
-/* #undef HAVE_LZMADEC_H */
-
 /* Define to 1 if you have the <lzma.h> header file. */
 /* #undef HAVE_LZMA_H */
 

diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c
index ffffab9638adcb7db52bc32a40038aaad9cb8e06..96d08aa6c2d3bf1f40c6841d18e5c51b329cee8e 100644 (file)
--- a/libarchive/archive_read_support_format_xar.c
+++ b/libarchive/archive_read_support_format_xar.c
@@ -1745,15 +1745,6 @@ decompression_cleanup(struct archive_read *a)
 #if defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
        if (xar->lzstream_valid)
                lzma_end(&(xar->lzstream));
-#elif defined(HAVE_LZMA_H) && defined(HAVE_LIBLZMA)
-       if (xar->lzstream_valid) {
-               if (lzmadec_end(&(xar->lzstream)) != LZMADEC_OK) {
-                       archive_set_error(&a->archive,
-                           ARCHIVE_ERRNO_MISC,
-                           "Failed to clean up lzmadec decompressor");
-                       r = ARCHIVE_FATAL;
-               }
-       }
 #endif
        return (r);
 }