Fix Makefiles to use system compiler settings

2 files changed, 95 insertions, 0 deletions

diff --git a/debian/patches/19-fix-makefiles-to-use-system-compiler-settings.patch b/debian/patches/19-fix-makefiles-to-use-system-compiler-settings.patch
new file mode 100644
index 0000000..f63361b
--- /dev/null
+++ b/debian/patches/19-fix-makefiles-to-use-system-compiler-settings.patch
@@ -0,0 +1,94 @@
+From: Andrej Shadura <andrewsh@debian.org>
+Date: Mon, 4 Jan 2021 19:21:03 +0100
+Subject: Fix Makefiles to use system compiler settings
+
+---
+ src/osdctl/Makefile |  7 +++----
+ src/osdsh/Makefile  | 31 +++++++++++++------------------
+ 2 files changed, 16 insertions(+), 22 deletions(-)
+
+diff --git a/src/osdctl/Makefile b/src/osdctl/Makefile
+index cf2bb66..e670a2a 100644
+--- a/src/osdctl/Makefile
++++ b/src/osdctl/Makefile
+@@ -1,17 +1,16 @@
+-CC     = gcc
++CC    ?= gcc
+ PREFIX = /usr
+ BINDIR = $(PREFIX)/bin
+ DOCDIR = $(PREFIX)/doc/osdsh
+ LIBDIR = -L/usr/X11R6/lib -L/usr/lib
+ LIBS   = $(LIBDIR)
+-CFLAGS = -O3
+ 
+ 
+ all: osdctl
+ 
+ osdctl:
+-	gcc $(LIBDIR) $(LIBS) $(CFLAGS) -o $@ $@.c
++	$(CC) $(LIBDIR) $(LIBS) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $@ $@.c
+ 
+-clean: 
++clean:
+ 	rm -f osdctl
+ 
+diff --git a/src/osdsh/Makefile b/src/osdsh/Makefile
+index 320651b..5c161f9 100644
+--- a/src/osdsh/Makefile
++++ b/src/osdsh/Makefile
+@@ -1,10 +1,10 @@
+-CC     = gcc
++CC    ?= gcc
+ PREFIX = /usr
+ BINDIR = $(PREFIX)/bin
+ DOCDIR = $(PREFIX)/doc/osdsh
+ LIBDIR = -L/usr/X11R6/lib -L/usr/lib
+ LIBS   = $(LIBDIR) -lxosd -lpthread
+-CFLAGS = -O3 -rdynamic
++CFLAGS += -rdynamic
+ 
+ #APMOBJS = apmwatch.o
+ #APMLIBS = -lapm
+@@ -17,12 +17,11 @@ all: osdsh libs
+ libs: libosdshclock.so libosdshmixer.so libosdshnet.so
+ 
+ %.o: %.c
+-
+-	gcc -fPIC -c $<
++	$(CC) -fPIC -c $(CFLAGS) $(CPPFLAGS) $<
+ 
+ osdsh: $(OBJS)
+-	gcc -c $(CFLAGS) $@.c
+-	gcc $(CFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl
++	$(CC) -c $(CFLAGS) $(CPPFLAGS) $@.c
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ osdsh.o $(OBJS) $(LIBS) -ldl
+ 
+ clean: libclean
+ 	rm -f osdsh
+@@ -31,18 +30,14 @@ clean: libclean
+ libclean:
+ 	rm -f libosdsh*.so
+ 
+-libosdshclock.so: 
+-	gcc -fPIC -c clockdisplay.c
+-	gcc -shared -o $@ clockdisplay.o utils.o
++libosdshclock.so: clockdisplay.o
++	$(CC) -shared $(LDFLAGS) -o $@ clockdisplay.o utils.o
+ 
+-libosdshmixer.so:
+-	gcc -fPIC -c mixerwatch.c
+-	gcc -shared -o $@ mixerwatch.o utils.o
++libosdshmixer.so: mixerwatch.o
++	$(CC) -shared $(LDFLAGS) -o $@ mixerwatch.o utils.o
+ 
+-libosdshapm.so:
+-	gcc -fPIC -c apmwatch.c
+-	gcc -shared -o $@ apmwatch.o utils.o -lapm
++libosdshapm.so: apmwatch.o utils.o
++	$(CC) -shared $(LDFLAGS) -o $@ apmwatch.o utils.o -lapm
+ 
+-libosdshnet.so: 
+-	gcc -fPIC -c connectionwatch.c
+-	gcc -shared -o $@ connectionwatch.o utils.o
++libosdshnet.so: connectionwatch.o utils.o
++	$(CC) -shared $(LDFLAGS) -o $@ connectionwatch.o utils.o
diff --git a/debian/patches/series b/debian/patches/series
index 1350356..995d604 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
 16-explicitly-include-unistd.h.patch
 17-explicitly-include-string.h.patch
 18-use-snprintf-for-a-bit-more-robust-string-handling.patch
+19-fix-makefiles-to-use-system-compiler-settings.patch