Skip to contentSkip to conversation

package/gpsd: drop patch

PATCH New Fabrice Fontaine 2 participants 2 messages Jun 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 ...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
package/gpsd/0001-SConstruct-do-not-force-O2-by-default.patch deleted +0 -29
deleted file mode 100644
index 641afa30af..0000000000
@@ -1,29 +0,0 @@
-From eb7cce5dbb53a64cf55ac0d9a7fa4dcbebd4b173 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-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 <[email protected]>
----
- 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
-
package/gpsd/gpsd.mk +4 -1
index 49de4b256c..0925e0340f 100644
@@ -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="$(GPS_CFLAGS)"
 
 define GPSD_BUILD_CMDS
 	(cd $(@D); \
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/gpsd: drop patch

Fabrice, All,

On 2020-06-21 22:41 +0200, Fabrice Fontaine spake thusly:

Quoted 6 lines

This patch is not needed since version 3.19 and
https://gitlab.com/gpsd/gpsd/-/commit/e3ec42e08a08af377499551d0528fc6ddf74cc12

So drop this patch and set CCFLAGS

[--SNIP--]

package/gpsd/gpsd.mk ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) · line 206

Quoted 13 lines
package/gpsd/gpsd.mk +4 -1
index 49de4b256c..0925e0340f 100644
@@ -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="$(GPS_CFLAGS)"

Typo: GPSD_CFLAGS, not GPS_CFLAGS, I guess?

Applied to master with that fixed. thanks.

Regards,
Yann E. MORIN.

Quoted 9 lines
package/gpsd/gpsd.mk +0 -0
 define GPSD_BUILD_CMDS
 	(cd $(@D); \
Signature · 6 lines
2.26.2

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'