From 275dbb3addfcdaec69126be04f4dda9c768470be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 21 Jun 2020 22:41:32 +0200 Subject: [PATCH] package/gpsd: drop patch This patch is not needed since version 3.19 and https://gitlab.com/gpsd/gpsd/-/commit/e3ec42e08a08af377499551d0528fc6ddf74cc12 So drop this patch and set CCFLAGS Signed-off-by: Fabrice Fontaine [yann.morin.1998@free.fr: s/GPS_CFLAGS/GPSD_CFLAGS/ ] Signed-off-by: Yann E. MORIN --- ...Construct-do-not-force-O2-by-default.patch | 29 ------------------- package/gpsd/gpsd.mk | 5 +++- 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch diff --git a/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch b/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch deleted file mode 100644 index 641afa30af..0000000000 --- a/package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch +++ /dev/null @@ -1,29 +0,0 @@ -From eb7cce5dbb53a64cf55ac0d9a7fa4dcbebd4b173 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Mon, 14 Aug 2017 23:24:38 +0200 -Subject: [PATCH] SConstruct: do not force -O2 by default - --O2 can cause problems on some architectures, so do not force it by - default. - -Signed-off-by: Waldemar Brodkorb ---- - SConstruct | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/SConstruct b/SConstruct -index fe444a2..93d91a4 100644 ---- a/SConstruct -+++ b/SConstruct -@@ -330,8 +330,6 @@ if not 'CCFLAGS' in os.environ: - # Should we build with optimisation? - if env['debug'] or env['coveraging']: - env.Append(CCFLAGS=['-O0']) -- else: -- env.Append(CCFLAGS=['-O2']) - - # Get a slight speedup by not doing automatic RCS and SCCS fetches. - env.SourceCode('.', None) --- -2.9.4 - diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk index 49de4b256c..96176fb187 100644 --- a/package/gpsd/gpsd.mk +++ b/package/gpsd/gpsd.mk @@ -200,7 +200,10 @@ ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) GPSD_SCONS_OPTS += max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) endif -GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)" +GPSD_SCONS_ENV += \ + LDFLAGS="$(GPSD_LDFLAGS)" \ + CFLAGS="$(GPSD_CFLAGS)" \ + CCFLAGS="$(GPSD_CFLAGS)" define GPSD_BUILD_CMDS (cd $(@D); \ -- 2.30.2