Revert "Use the .so removal trick for libz"

This reverts commit 1c8e3e1.
brimdata · Jan 6, 2024 · d47c98b · d47c98b
1 parent 1c8e3e1
commit d47c98b
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -86,7 +86,9 @@ jobs:
       if: startsWith(matrix.platform, 'ubuntu-')
       run: |
         sudo apt-get -y install ccache cmake make gcc g++ flex libfl-dev bison libpcap-dev libssl-dev python3 python3-dev python3-setuptools swig zlib1g-dev zip libmaxminddb-dev
-        sudo find /usr/lib \( -name libpcap.so\* -o -name libmaxminddb.so\* -o -name libz.so\* \) -delete
+        sudo rm /usr/lib/x86_64-linux-gnu/libpcap*.so* /usr/lib/x86_64-linux-gnu/libmaxmind*.so*
+        echo "extra_linux_config=-D ZLIB_USE_STATIC_LIBS=ON" >> $GITHUB_OUTPUT
+      id: linux
 
     - name: Install dependencies (macOS)
       if: startsWith(matrix.platform, 'macos-')
@@ -100,7 +102,7 @@ jobs:
       if: "!startsWith(matrix.platform, 'windows-')"
       run: |
         cd zeek-src
-        ./configure --binary-package --enable-static-broker --enable-static-binpac --disable-spicy --disable-af-packet --disable-zeekctl --disable-python --disable-broker-tests --disable-auxtools --disable-archiver --osx-min-version=12
+        ./configure --binary-package --enable-static-broker --enable-static-binpac --disable-spicy --disable-af-packet --disable-zeekctl --disable-python --disable-broker-tests --disable-auxtools --disable-archiver --osx-min-version=12 -D OPENSSL_USE_STATIC_LIBS=TRUE ${{ steps.linux.outputs.extra_linux_config }}
         make -j${{ steps.cpu-cores.outputs.count }}
         sudo make install
         sudo strip /usr/local/zeek/bin/zeek