Fix ability to build in zlib, then ignore it. Needs libax25 to have zlib.

This commit is contained in:
Dave Hibberd 2023-08-05 00:49:38 +01:00
parent c5b5804776
commit a2d04aafd5
3 changed files with 24 additions and 1 deletions

2
debian/control vendored
View File

@ -3,7 +3,7 @@ Section: hamradio
Priority: optional Priority: optional
Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org> Maintainer: Debian Hamradio Maintainers <debian-hams@lists.debian.org>
Uploaders: Dave Hibberd <d@vehibberd.com> Uploaders: Dave Hibberd <d@vehibberd.com>
Build-Depends: debhelper-compat (= 13), libax25-dev Build-Depends: debhelper-compat (= 13), libax25-dev, zlib1g-dev
Standards-Version: 4.6.0.1 Standards-Version: 4.6.0.1
Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode Vcs-Browser: https://salsa.debian.org/debian-hamradio-team/uronode
Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git Vcs-Git: https://salsa.debian.org/debian-hamradio-team/uronode.git

View File

@ -1,5 +1,6 @@
netrom-motd.patch netrom-motd.patch
non-interactive-install.patch non-interactive-install.patch
zlib-ifdef.patch
hardening hardening
folder-update folder-update
install-dir-creation install-dir-creation

22
debian/patches/zlib-ifdef.patch vendored Normal file
View File

@ -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" ]