KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mdadm: fix parameter quoting

Browse source 
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>
This commit is contained in:
Jo-Philipp Wich 2017-10-27 03:25:29 +02:00
parent 8eadec40bd
commit d4e7af5278
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
package/utils/mdadm/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=mdadm PKG_NAME:=mdadm
PKG_VERSION:=4.0 PKG_VERSION:=4.0
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -41,16 +41,20 @@ define Package/mdadm/conffiles
/etc/config/mdadm /etc/config/mdadm
endef 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 TARGET_LDFLAGS += -Wl,--gc-sections
MAKE_VARS += CHECK_RUN_DIR=0
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) \ $(call Build/Compile/Default,mdadm)
CC="$(TARGET_CC)" \
CFLAGS="$(TARGET_CFLAGS) -DHAVE_STDINT_H" \
LDFLAGS="$(TARGET_LDFLAGS)" \
CHECK_RUN_DIR=0 \
mdadm
endef endef
define Package/mdadm/install define Package/mdadm/install