From: Philip Prindeville <redacted>
Date: Fri, 19 Mar 2021 22:26:31 +0000 (-0600)
Subject: treewide: fix places where $(FPIC) is unquoted
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=0d5c6769f15f15ce950d2b41dce3341b5c160c36;p=openwrt-packages.git

treewide: fix places where $(FPIC) is unquoted

Fixes part of issue #14921.

When $(FPIC) gets added to TARGET_CFLAGS (for instance), we can
count on $(TARGET_CFLAGS) in turn being quoted when it gets
expanded.  But there are a few places where $(FPIC) gets
expanded directly into environment variables passed on the
command line, such as when setting lt_cv_* variables as in this
case.

It's wrong to assume that the expansion of $(FPIC) won't require
quoting (such as it containing spaces) if it has multiple compiler
flags.

Signed-off-by: Philip Prindeville <redacted>
---

diff --git a/libs/libredblack/Makefile b/libs/libredblack/Makefile
index 2e3f020b6..5f1bcc7ea 100644
--- a/libs/libredblack/Makefile
+++ b/libs/libredblack/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libredblack
 PKG_VERSION:=1.3
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/libredblack
@@ -38,7 +38,7 @@ define Package/libredblack/description
 endef
 
 CONFIGURE_ARGS += --without-rbgen
-CONFIGURE_VARS += lt_cv_prog_cc_pic=$(FPIC)
+CONFIGURE_VARS += lt_cv_prog_cc_pic="$(FPIC)"
 MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS)"
 
 define Build/InstallDev
diff --git a/sound/madplay/Makefile b/sound/madplay/Makefile
index d3a80fc54..5c8c3ab88 100644
--- a/sound/madplay/Makefile
+++ b/sound/madplay/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=madplay
 PKG_VERSION:=0.15.2b
-PKG_RELEASE:=9
+PKG_RELEASE:=10
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/mad \
@@ -51,7 +51,7 @@ CONFIGURE_ARGS += \
 	--with-alsa
 
 CONFIGURE_VARS += \
-	lt_prog_compiler_pic=$(FPIC)
+	lt_prog_compiler_pic="$(FPIC)"
 
 MAKE_FLAGS += CFLAGS="$(TARGET_CFLAGS)"