From a2d04aafd5d57f6eca417f22d1f83976dd57843c Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Sat, 5 Aug 2023 00:49:38 +0100 Subject: [PATCH] Fix ability to build in zlib, then ignore it. Needs libax25 to have zlib. --- debian/control | 2 +- debian/patches/series | 1 + debian/patches/zlib-ifdef.patch | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 debian/patches/zlib-ifdef.patch diff --git a/debian/control b/debian/control index d26f7f2..22956e6 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: hamradio Priority: optional Maintainer: Debian Hamradio Maintainers Uploaders: Dave Hibberd -Build-Depends: debhelper-compat (= 13), libax25-dev +Build-Depends: debhelper-compat (= 13), libax25-dev, zlib1g-dev Standards-Version: 4.6.0.1 Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git diff --git a/debian/patches/series b/debian/patches/series index 95dbf75..7d47ffe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ netrom-motd.patch non-interactive-install.patch +zlib-ifdef.patch hardening folder-update install-dir-creation diff --git a/debian/patches/zlib-ifdef.patch b/debian/patches/zlib-ifdef.patch new file mode 100644 index 0000000..003b860 --- /dev/null +++ b/debian/patches/zlib-ifdef.patch @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -74,14 +74,15 @@ + _sleep 1 + echo -n "Checking for the existence of the Zlib headers... " + ZLIB="" +-HAVEZLIB="#undef HAVE_ZLIB" ++HAVEZLIB="#undef HAVE_ZLIB_H" + for zlibdir in /usr/include /usr/local/include + do + if [ -f $zlibdir/zlib.h ] + then +- echo $zlibdir/zlib.h +- ZLIB="-lz" +- HAVEZLIB="#define HAVE_ZLIB 1" ++ echo "skipping zlib until it works right..." ++ # echo $zlibdir/zlib.h ++ # ZLIB="-lz" ++ # HAVEZLIB="#define HAVE_ZLIB_H 1" + fi + done + if [ -z "$ZLIB" ]