dtc: switch to compiling with meson

Faster and more parallel friendly.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/libs/dtc/Makefile b/libs/dtc/Makefile
index 97c17c54d7dc6b9186b0d7359f829792ea4ec654..34aa76602852fea9ea7a996933a9930e43bcdf14 100644 (file)
--- a/libs/dtc/Makefile
+++ b/libs/dtc/Makefile
@@ -22,6 +22,7 @@ PKG_LICENSE_FILES:=GPL
 PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/meson.mk
 
 define Package/dtc
   SECTION:=utils
@@ -38,7 +39,7 @@ endef
 
 define Package/dtc/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/bin/dtc $(1)/usr/bin
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/dtc $(1)/usr/bin
 endef
 
 
@@ -53,11 +54,11 @@ endef
 
 define Package/fdt-utils/install
        $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/convert-dtsv0 $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/fdtdump $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/fdtget $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/fdtput $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/fdtoverlay $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/convert-dtsv0 $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fdtdump $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fdtget $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fdtput $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fdtoverlay $(1)/usr/bin
 endef
 
 
@@ -74,22 +75,20 @@ endef
 
 define Package/libfdt/install
        $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/lib/libfdt*.so* $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfdt*.so* $(1)/usr/lib
 endef
 
-# NO_PYTHON is for disabling pylibfdt
-MAKE_FLAGS += \
-       PREFIX= \
-       NO_PYTHON=1 \
-       NO_VALGRIND=1 \
-       NO_YAML=1 \
-       EXTRA_CFLAGS=$(EXTRA_CFLAGS) \
+MESON_ARGS += \
+       -Dtools=true \
+       -Dyaml=disabled \
+       -Dvalgrind=disabled \
+       -Dpython=disabled
 
 define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/lib
        $(INSTALL_DIR) $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include
-       $(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib
 endef
 
 $(eval $(call BuildPackage,dtc))