From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 27 Oct 2017 01:25:29 +0000 (+0200)
Subject: mdadm: fix parameter quoting
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3bb881862bd836d62d41cf8c2885b3da2f1ea8a5;p=librecmc%2Flibrecmc.git

mdadm: fix parameter quoting

Ensure that path defines are passed quoted to the compiler in order
to avoid cpp syntax errors.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d4e7af52788fe6a5495064606e674ed6897a69cb)
---

diff --git a/package/utils/mdadm/Makefile b/package/utils/mdadm/Makefile
index 826424247f..2b44db284f 100644
--- a/package/utils/mdadm/Makefile
+++ b/package/utils/mdadm/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mdadm
 PKG_VERSION:=4.0
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -41,16 +41,20 @@ define Package/mdadm/conffiles
 /etc/config/mdadm
 endef
 
-TARGET_CFLAGS += -ffunction-sections -fdata-sections -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS -DCONFFILE="/var/etc/mdadm.conf" -DMAP_DIR="/var/run/mdadm" -DMDMON_DIR="/var/run/mdadm" -DFAILED_SLOTS_DIR="/var/run/mdadm/failed-slots"
+TARGET_CFLAGS += \
+	-ffunction-sections -fdata-sections \
+	-DHAVE_STDINT_H -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS \
+	-DCONFFILE='\"/var/etc/mdadm.conf\"' \
+	-DMAP_DIR='\"/var/run/mdadm\"' \
+	-DMDMON_DIR='\"/var/run/mdadm\"' \
+	-DFAILED_SLOTS_DIR='\"/var/run/mdadm/failed-slots\"'
+
 TARGET_LDFLAGS += -Wl,--gc-sections
 
+MAKE_VARS += CHECK_RUN_DIR=0
+
 define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS) -DHAVE_STDINT_H" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		CHECK_RUN_DIR=0 \
-		mdadm
+	$(call Build/Compile/Default,mdadm)
 endef
 
 define Package/mdadm/install