Commit c8a222f2 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

gpsd: remove patch to handle ncurses5-config custom location 



Now that ncurses has been bumped to 5.9, it installs .pc files for
pkg-config, which allows gpsd to find it properly without the need to
specify a custom location for ncurses5-config.

Since gpsd now uses pkg-config to find the ncurses library, we also
add host-pkg-config in the dependencies.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent ea479450

package/gpsd/gpsd-02-sconstruct-ncurses-config-path.patch

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
Add option to specify the path to ncurses5-config



By default, gpsd's SConstruct looks in the PATH to find

ncurses5-config, which means that it finds our HOST_DIR

ncurses5-config. We add an option that allows to specify a custom path

to the ncurses5-config script.



Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>



Index: b/SConstruct

===================================================================

--- a/SConstruct

+++ b/SConstruct

@@ -172,6 +172,7 @@

     ("fixed_stop_bits",     0,             "fixed serial port stop bits"),

     ("target",              "",            "cross-development target"),

     ("sysroot",             "",            "cross-development system root"),

+    ("ncurses_config",      "",            "ncurses5-config path"),

     )

 for (name, default, help) in nonboolopts:

     opts.Add(name, help, default)

@@ -447,6 +448,11 @@

 else:

     pkg_config = lambda pkg: ['!%s --cflags --libs --static %s' %(env['PKG_CONFIG'], pkg, )]

 

+if env['ncurses_config']:

+    ncurses_config = env['ncurses_config']

+else:

+    ncurses_config = "ncurses5-config"

+

 # The actual distinction here is whether the platform has ncurses in the

 # base system or not. If it does, pkg-config is not likely to tell us

 # anything useful. FreeBSD does, Linux doesn't. Most likely other BSDs

@@ -455,8 +461,8 @@

 if env['ncurses']:

     if config.CheckPKG('ncurses'):

         ncurseslibs = pkg_config('ncurses')

-    elif config.CheckExecutable('ncurses5-config --version', 'ncurses5-config'):

-        ncurseslibs = ['!ncurses5-config --libs --cflags']

+    elif config.CheckExecutable('%s --version' % ncurses_config, 'ncurses5-config'):

+        ncurseslibs = ['!%s --libs --cflags' % ncurses_config]

     elif sys.platform.startswith('freebsd'):

         ncurseslibs= [ '-lncurses' ]

     elif sys.platform.startswith('openbsd'):

package/gpsd/gpsd.mk

+1 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ GPSD_LICENSE = BSD-3c 
GPSD_LICENSE_FILES = COPYING

GPSD_INSTALL_STAGING = YES



GPSD_DEPENDENCIES = host-scons

GPSD_DEPENDENCIES = host-scons host-pkg-config



GPSD_LDFLAGS = $(TARGET_LDFLAGS)
@@ -25,7 +25,6 @@ GPSD_SCONS_OPTS = \ 


ifeq ($(BR2_PACKAGE_NCURSES),y)

	GPSD_DEPENDENCIES += ncurses

	GPSD_SCONS_OPTS += ncurses_config=$(STAGING_DIR)/usr/bin/ncurses5-config

else

	GPSD_SCONS_OPTS += ncurses=no

endif