Disable tests in the bundled zlib

rui314 · Aug 19, 2023 · fad4c1b · fad4c1b
1 parent 3c88682
commit fad4c1b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 31 deletions.
diff --git a/install-build-deps.sh b/install-build-deps.sh
@@ -12,42 +12,42 @@ set -x
 case "$ID-$VERSION_ID" in
 ubuntu-20.* | pop-20.*)
   apt-get update
-  apt-get install -y cmake zlib1g-dev gcc g++ g++-10
+  apt-get install -y cmake gcc g++ g++-10
   apt-get install -y file
   ;;
 ubuntu-* | pop-* | linuxmint-* | debian-* | raspbian-*)
   apt-get update
-  apt-get install -y cmake zlib1g-dev gcc g++
+  apt-get install -y cmake gcc g++
   apt-get install -y file
   ;;
 fedora-*)
-  dnf install -y gcc-g++ cmake zlib-devel
+  dnf install -y gcc-g++ cmake
   dnf install -y glibc-static file libstdc++-static diffutils util-linux
   ;;
 opensuse-leap-*)
-  zypper install -y make cmake zlib-devel gcc-c++ gcc11-c++
+  zypper install -y make cmake gcc-c++ gcc11-c++
   zypper install -y glibc-devel-static tar diffutils util-linux
   ;;
 opensuse-tumbleweed-*)
-  zypper install -y make cmake zlib-devel gcc-c++
+  zypper install -y make cmake gcc-c++
   zypper install -y glibc-devel-static tar diffutils util-linux
   ;;
 gentoo-*)
   emerge-webrsync
-  emerge dev-util/cmake sys-libs/zlib
+  emerge dev-util/cmake
   ;;
 arch-*)
   pacman -Sy
-  pacman -S --needed --noconfirm base-devel zlib cmake util-linux
+  pacman -S --needed --noconfirm base-devel cmake util-linux
   ;;
 void-*)
   xbps-install -Sy xbps
-  xbps-install -Sy bash make cmake zlib-devel gcc
+  xbps-install -Sy bash make cmake gcc
   xbps-install -Sy tar diffutils util-linux
   ;;
 alpine-*)
   apk update
-  apk add bash make linux-headers cmake zlib-dev gcc g++
+  apk add bash make linux-headers cmake gcc g++
   ;;
 *)
   echo "Error: don't know anything about build dependencies on $ID-$VERSION_ID"

diff --git a/third-party/zlib/CMakeLists.txt b/third-party/zlib/CMakeLists.txt
@@ -189,25 +189,3 @@ endif()
 if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL )
     install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}")
 endif()
-
-#============================================================================
-# Example binaries
-#============================================================================
-
-add_executable(example test/example.c)
-target_link_libraries(example zlib)
-add_test(example example)
-
-add_executable(minigzip test/minigzip.c)
-target_link_libraries(minigzip zlib)
-
-if(HAVE_OFF64_T)
-    add_executable(example64 test/example.c)
-    target_link_libraries(example64 zlib)
-    set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-    add_test(example64 example64)
-
-    add_executable(minigzip64 test/minigzip.c)
-    target_link_libraries(minigzip64 zlib)
-    set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
-endif()
diff --git a/third-party/zlib/zconf.h → third-party/zlib/zconf.h.included b/third-party/zlib/zconf.h → third-party/zlib/zconf.h.included