diff --git a/recipes-extra/gpsd/gpsd/gpsd-3.3-ldflags.patch b/recipes-extra/gpsd/gpsd/gpsd-3.3-ldflags.patch new file mode 100644 index 0000000..0c37cd3 --- /dev/null +++ b/recipes-extra/gpsd/gpsd/gpsd-3.3-ldflags.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/391299 + +split up linking flags into multiple arguments + +Index: gpsd-3.10/SConstruct +=================================================================== +--- gpsd-3.10.orig/SConstruct 2017-03-28 23:47:02.815665786 +0200 ++++ gpsd-3.10/SConstruct 2017-03-28 23:47:40.463666285 +0200 +@@ -250,7 +250,7 @@ + env.Replace(**{j: os.getenv(i)}) + for flag in ["LDFLAGS", "LINKFLAGS", "SHLINKFLAGS", "CPPFLAGS"]: + if os.environ.has_key(flag): +- env.MergeFlags({flag : [os.getenv(flag)]}) ++ env.MergeFlags({flag : Split(os.getenv(flag))}) + + + # Keep scan-build options in the environment diff --git a/recipes-extra/gpsd/gpsd_3.10.bb b/recipes-extra/gpsd/gpsd_3.10.bb index 4e215ac..3996ed6 100644 --- a/recipes-extra/gpsd/gpsd_3.10.bb +++ b/recipes-extra/gpsd/gpsd_3.10.bb @@ -11,6 +11,7 @@ PR = "r3.19" SRC_URI = "http://download.savannah.gnu.org/releases/${PN}/${P}.tar.gz \ file://0002-SConstruct-respect-sysroot-also-in-SPLINTOPTS.patch \ file://0001-SConstruct-disable-html-and-man-docs-building-becaus.patch \ + file://gpsd-3.3-ldflags.patch \ file://no-rpath-please.patch \ file://gpsd-tsip-pps.patch \ file://leave-argv-untouched.patch \ @@ -33,6 +34,8 @@ INITSCRIPT_PARAMS = "defaults 35" export STAGING_INCDIR export STAGING_LIBDIR +export LINKFLAGS="${TARGET_LDFLAGS}" +export SHLINKFLAGS="${TARGET_LDFLAGS}" EXTRA_OESCONS = " \ sysroot=${STAGING_DIR_TARGET} \