From 4a28b7fad3414e949cf3283356b06ee9fef841f5 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Fri, 4 Jun 2021 15:30:02 +0200 Subject: [PATCH] gpsd: fix compilation with x86 glibc The sysroot has to point to the toolchain directory. The directory includes libraries like libm. However, the STAGING_DIR needs to be added to the CFLAGS. Fixes #15773 [As suggested by jow] Signed-off-by: Nick Hainke (cherry picked from commit 35b18ddfc4d5a9e065bb0730523ad338229398de) --- utils/gpsd/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/gpsd/Makefile b/utils/gpsd/Makefile index c51dfcf411..ae24b8e901 100644 --- a/utils/gpsd/Makefile +++ b/utils/gpsd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gpsd PKG_VERSION:=3.21 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SAVANNAH/$(PKG_NAME) @@ -95,6 +95,7 @@ define Package/libgps/description endef SCONS_VARS += \ + CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) -L$(STAGING_DIR)/usr/lib" \ LINKFLAGS="$(TARGET_LDFLAGS)" SCONS_OPTIONS += \ @@ -116,7 +117,7 @@ SCONS_OPTIONS += \ implicit_link=no \ chrpath=no \ manbuild=no \ - sysroot="$(STAGING_DIR)" \ + sysroot="$(TOOLCHAIN_DIR)" \ target="$(TARGET_CROSS:-=)" define Build/InstallDev -- 2.30.2