Fresh pull from upstream 17.01 branch

[librecmc/librecmc.git] / tools / qemu / Makefile

diff --git a/tools/qemu/Makefile b/tools/qemu/Makefile
index 2d954e47aabe2f314f4ca81a9511d79499669fdb..3eac66f01e949df0000245cc8317d39f751fbbb6 100644 (file)
--- a/tools/qemu/Makefile
+++ b/tools/qemu/Makefile
@@ -16,17 +16,21 @@ PKG_HASH:=33ceae3fbe516f2cbb151dc98d16c8ccfec74b1056674ad715e75a2f7fed45c3
 
 include $(INCLUDE_DIR)/host-build.mk
 
-HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
-
-define Host/Configure
-       (cd $(HOST_BUILD_DIR); \
-               CFLAGS="$(HOST_CFLAGS)" \
-               LDFLAGS="$(HOST_LDFLAGS)" \
-               $(HOST_CONFIGURE_CMD) \
-               --extra-cflags="$(HOST_CFLAGS)" \
-               --enable-uuid \
-       )
-endef
+HOST_CFLAGS += \
+       -I$(STAGING_DIR_HOST)/include/e2fsprogs \
+       -DAES_cbc_encrypt=QEMU_AES_cbc_encrypt \
+       -DAES_decrypt=QEMU_AES_decrypt \
+       -DAES_encrypt=QEMU_AES_encrypt \
+       -DAES_set_decrypt_key=QEMU_AES_set_decrypt_key \
+       -DAES_set_encrypt_key=QEMU_AES_set_encrypt_key
+
+HOST_CONFIGURE_VARS := \
+       CFLAGS="$(HOST_CFLAGS)" \
+       LDFLAGS="$(HOST_LDFLAGS)"
+
+HOST_CONFIGURE_ARGS := \
+       --extra-cflags="$(HOST_CFLAGS)" \
+       --enable-uuid
 
 define Host/Compile
        $(MAKE) -C $(HOST_BUILD_DIR) qemu-img