Hibbian
/
linbpq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This builds and links to system libs!

This commit is contained in:
Hibby 2024-11-29 12:04:09 +00:00
parent e35489a925
commit 8e7a943558
No known key found for this signature in database
2 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/lintian-overrides vendored
View File

@ -1,13 +1,8 @@
# weirdness from oarc packaging
linbpq: dir-or-file-in-opt [opt/oarc/]
linbpq: dir-or-file-in-opt [opt/oarc/bpq/]
# these are ok, just held within the program
linbpq: embedded-library libminiupnpc [usr/sbin/linbpq]
linbpq: embedded-library libpng [usr/sbin/linbpq]
# i know!
linbpq: no-manual-page [usr/sbin/linbpq]
# Build fails
linbpq: hardening-no-bindnow [usr/sbin/linbpq]
# Directory is populated on first run
linbpq: package-contains-empty-directory [opt/oarc/bpq/]
# Code convenience

40
debian/patches/makefile vendored
View File

@ -1,49 +1,29 @@
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
# To exclude i2c support run make noi2c
-OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pngwutil.o\
+COMPLETE_SRC = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pngwutil.o\
pngread.o pngwrite.o png.o pngerror.o pngget.o pngmem.o APRSIconData.o AISCommon.o\
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 \
@@ -18,26 +18,34 @@
@@ -18,9 +18,12 @@
# Configuration:
CC = gcc
-
-all: CFLAGS = -DLINBPQ -MMD -g -fcommon
-all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a
-all: linbpq
+LD = $(CC)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS+=-DLINBPQ
+LDFLAGS:=
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+$(warning CFLAGS are $(CFLAGS))
+$(warning LDLAGS are $(LDFLAGS))
+
+LIBS = -lrt -lm -lz -lpthread -lconfig -lpcap -lpaho-mqtt3a -ljansson -lminiupnpc
+all: CFLAGS += -DLINBPQ -MMD -g -fcommon
+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap
all: linbpq
+all: linbpq
-nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g -DNOMQTT
+nomqtt: CFLAGS += -DNOMQTT
nomqtt: linbpq
@@ -32,12 +35,15 @@
-noi2c: CFLAGS = -DLINBPQ -MMD -DNOI2C -g -fcommon
+noi2c: CFLAGS += -DNOI2C
noi2c: linbpq
-
-linbpq: $(OBJS)
linbpq: $(OBJS)
- gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
- sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
+linbpq: $(COMPLETE_SRC)
+ $(GCC) $(COMPLETE_SRC) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq
+ gcc $(OBJS) $(LDFLAGS) $(LIBS) -o linbpq
+ # sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
-include *.d
@ -53,7 +33,7 @@
-
+install:
+ install -b -m 755 -D -d debian/linbpq/usr/sbin
+ install -b -m 755 -p linbpq debian/linbpq/usr/sbin
+ install -b -m 755 -s -p linbpq debian/linbpq/usr/sbin
+
+clean:
+ $(RM) *.d