From 426f47ccb62cae1ac159d871fa9bad6b44b912cf Mon Sep 17 00:00:00 2001 From: Dave Hibberd Date: Wed, 21 May 2025 21:45:54 +0100 Subject: [PATCH] It builds successfully! --- debian/changelog | 9 +++++++-- debian/patches/makefile | 11 ++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 891654a..3f1281e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -linbpq (6.0.24.67+repack-1) UNRELEASED; urgency=medium +linbpq (6.0.24.71+repack-1) UNRELEASED; urgency=medium * New upstream version 6.0.24.67+repack + * New upstream version 6.0.24.69+repack + * New upstream version 6.0.24.69.1+repack + * New upstream version 6.0.24.71+repack + * Okay that's a lot of updates. + * Refreshed d/p/makefile to reflect new CFLAG - -- Dave Hibberd Sat, 22 Mar 2025 00:22:40 +0000 + -- Dave Hibberd Wed, 21 May 2025 21:34:38 +0100 linbpq (6.0.24.66+repack-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium diff --git a/debian/patches/makefile b/debian/patches/makefile index 1cd608f..43c25cb 100644 --- a/debian/patches/makefile +++ b/debian/patches/makefile @@ -10,23 +10,24 @@ upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\ adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \ Multicast.o ARDOP.o IPCode.o FLDigi.o linether.o CMSAuth.o APRSCode.o BPQtoAGW.o KAMPactor.o\ -@@ -18,9 +17,12 @@ +@@ -18,9 +17,13 @@ # Configuration: CC = gcc - --all: CFLAGS = -DLINBPQ -MMD -g -rdynamic -fcommon +-all: CFLAGS = -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables -all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a ++ +CFLAGS:=$(shell dpkg-buildflags --get CFLAGS) +CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS) +LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) + -+all: CFLAGS += -DLINBPQ -MMD -g -fcommon -rdynamic -+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng ++all: CFLAGS += -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables ++all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng all: linbpq -@@ -32,12 +34,15 @@ +@@ -32,12 +35,15 @@ linbpq: $(OBJS)