From 73a3b5113ef0a1c8fdd893f92922a6b05865b9f1 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Fri, 16 Sep 2016 17:43:21 +0100 Subject: [PATCH] More attempts at getting this working again on wheezy. --- Makefile | 5 +++-- debian-wheezy/rules | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0c8178c..38ffa84 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PROGNAME=dump1090 -CC=gcc -std=c1x +CC=gcc CPPFLAGS += -DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\" -DMODES_DUMP1090_VARIANT=\"dump1090-fa\" ifneq ($(RTLSDR_PREFIX),"") @@ -12,7 +12,8 @@ ifneq ($(HTMLPATH),"") CPPFLAGS += -DHTMLPATH=\"$(HTMLPATH)\" endif -CFLAGS += -O2 -g -Wall -Werror -W -D_DEFAULT_SOURCE +DIALECT = -std=c11 +CFLAGS += $(DIALECT) -O2 -g -Wall -Werror -W -D_DEFAULT_SOURCE LIBS = -lpthread -lm -lrt ifeq ($(STATIC), yes) diff --git a/debian-wheezy/rules b/debian-wheezy/rules index 573eb30..76f0fcd 100755 --- a/debian-wheezy/rules +++ b/debian-wheezy/rules @@ -22,7 +22,7 @@ install_rtlsdr: cd rtl-sdr-build && cmake ../rtl-sdr -DCMAKE_INSTALL_PREFIX=./install && make install override_dh_auto_build: install_rtlsdr - dh_auto_build -- HTMLPATH=/usr/share/$(SRCNAME)/html DUMP1090_VERSION=$(DUMP1090_VERSION) STATIC=yes RTLSDR_PREFIX=rtl-sdr-build/install + dh_auto_build -- DIALECT=-std=gnu1x HTMLPATH=/usr/share/$(SRCNAME)/html DUMP1090_VERSION=$(DUMP1090_VERSION) STATIC=yes RTLSDR_PREFIX=rtl-sdr-build/install override_dh_install: dh_install