From: Mathias Kresin <dev@kresin.me>
Date: Tue, 2 Jan 2018 00:01:33 +0000 (+0100)
Subject: ppp: fix build with kernel 4.14.9+
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04cb1e0fd20196e2e6ec5f8864f5d694f134cbc1;p=openwrt%2Fstaging%2Fjogo.git

ppp: fix build with kernel 4.14.9+

With a9772285a724 ("linux/compiler.h: Split into compiler.h and
compiler_types.h") compiler.h was refactored and most its content was
moved to compiler_types.h. Both files are required to build ppp-mod-pppoa.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/package/network/services/ppp/Makefile b/package/network/services/ppp/Makefile
index 0614ebc58b..beeaa53c22 100644
--- a/package/network/services/ppp/Makefile
+++ b/package/network/services/ppp/Makefile
@@ -178,10 +178,15 @@ $(call Build/Configure/Default,, \
 	UNAME_M="$(ARCH)" \
 )
 	mkdir -p $(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux
-	cp \
+	$(CP) \
 		$(LINUX_DIR)/include/linux/compiler.h \
 		$(LINUX_DIR)/include/$(LINUX_UAPI_DIR)linux/atm*.h \
 		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
+
+	# Kernel 4.14.9+ only, ignore the exit status of cp in case the file
+	# doesn't exits
+	-$(CP) $(LINUX_DIR)/include/linux/compiler_types.h \
+		$(PKG_BUILD_DIR)/pppd/plugins/pppoatm/linux/
 endef
 
 TARGET_CFLAGS += -ffunction-sections -fdata-sections