print miniz version correctly

tpimh · Jul 31, 2018 · e2a5ac9 · e2a5ac9
1 parent 8e47fff
commit e2a5ac9
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/libarchive/opkg/miniz-version.patch b/libarchive/opkg/miniz-version.patch
@@ -0,0 +1,14 @@
+--- a/libarchive/archive_version_details.c.orig
++++ b/libarchive/archive_version_details.c
+@@ -65,7 +65,11 @@
+
+ archive_strcat(&str, ARCHIVE_VERSION_STRING);
+ if (zlib != NULL) {
++#ifdef MZ_VERSION
++ archive_strcat(&str, " miniz/");
++#else
+ archive_strcat(&str, " zlib/");
++#endif
+ archive_strcat(&str, zlib);
+ }
+ if (liblzma) {
diff --git a/libarchive/opkg/rules b/libarchive/opkg/rules
@@ -7,6 +7,7 @@ case "$1" in
  build)
  patch -p1 < opkg/libressl-fix.patch
  patch -p1 < opkg/miniz-support.patch
+ patch -p1 < opkg/miniz-version.patch
  rm -rf build-ninja
  cmake -Bbuild-ninja -H. -GNinja -DCMAKE_INSTALL_PREFIX="" -DBUILD_SHARED_LIBS=ON -DCMAKE_SYSROOT=/x86_64-pc-linux-musl -DENABLE_CAT_SHARED=ON -DENABLE_CPIO_SHARED=ON -DENABLE_TAR_SHARED=ON
  ninja -Cbuild-ninja -j1