From 4f45845814b7833f384ee79fc9f2a9a0bb1151ba Mon Sep 17 00:00:00 2001
From: Jiri <jvanek@redhat.com>
Date: Mon, 24 Jun 2024 19:57:58 +0200
Subject: [PATCH 1/4] Added quoting around compile properties

---
 compile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.mk b/compile.mk
index fd84d520..8f30a0b4 100644
--- a/compile.mk
+++ b/compile.mk
@@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG)
 else
 TEST_FLAG_PARAM :=
 endif
-COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) -DJDK_VENDOR=$(JDK_VENDOR) -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
+COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT="$(TEST_ROOT)" -DBUILD_ROOT="$(BUILD_ROOT)" -DJDK_VERSION="$(JDK_VERSION)" -DJDK_IMPL="$(JDK_IMPL)" -DJDK_VENDOR="$(JDK_VENDOR)" -DJCL_VERSION="$(JCL_VERSION)" -DBUILD_LIST="${COMPILE_BUILD_LIST}" -DRESOURCES_DIR="${RESOURCES_DIR}" -DSPEC="${SPEC}" -DTEST_JDK_HOME="${TEST_JDK_HOME}" -DJVM_VERSION="$(JVM_VERSION)" -DLIB_DIR="$(LIB_DIR)" ${TEST_FLAG_PARAM}
 
 
 compile:

From 49f5500fd94f503dc03d975f270f04dfdcc772d1 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 10 Jul 2024 16:10:06 +0200
Subject: [PATCH 2/4] Quoting jsut the vendor

---
 compile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.mk b/compile.mk
index 8f30a0b4..1857d4c4 100644
--- a/compile.mk
+++ b/compile.mk
@@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG)
 else
 TEST_FLAG_PARAM :=
 endif
-COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT="$(TEST_ROOT)" -DBUILD_ROOT="$(BUILD_ROOT)" -DJDK_VERSION="$(JDK_VERSION)" -DJDK_IMPL="$(JDK_IMPL)" -DJDK_VENDOR="$(JDK_VENDOR)" -DJCL_VERSION="$(JCL_VERSION)" -DBUILD_LIST="${COMPILE_BUILD_LIST}" -DRESOURCES_DIR="${RESOURCES_DIR}" -DSPEC="${SPEC}" -DTEST_JDK_HOME="${TEST_JDK_HOME}" -DJVM_VERSION="$(JVM_VERSION)" -DLIB_DIR="$(LIB_DIR)" ${TEST_FLAG_PARAM}
+COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) -DJDK_VENDOR="$(JDK_VENDOR)" -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
 
 
 compile:

From b3c6b07e74b1df4b99e3bb4c54a7a04962ff5d5c Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 10 Jul 2024 16:19:11 +0200
Subject: [PATCH 3/4] Quoting whole argument (seems more correct)

---
 compile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.mk b/compile.mk
index 1857d4c4..f3b6b8ce 100644
--- a/compile.mk
+++ b/compile.mk
@@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG)
 else
 TEST_FLAG_PARAM :=
 endif
-COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) -DJDK_VENDOR="$(JDK_VENDOR)" -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
+COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) "-DJDK_VENDOR=$(JDK_VENDOR)" -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
 
 
 compile:

From 626b6732a653d409f072230b1532ffde04f29851 Mon Sep 17 00:00:00 2001
From: Jiri Vanek <jvanek@redhat.com>
Date: Wed, 10 Jul 2024 16:24:21 +0200
Subject: [PATCH 4/4] Replaced hardcoded " by $(Q)

---
 compile.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile.mk b/compile.mk
index f3b6b8ce..7e4aeeeb 100644
--- a/compile.mk
+++ b/compile.mk
@@ -38,7 +38,7 @@ TEST_FLAG_PARAM := -DTEST_FLAG=$(TEST_FLAG)
 else
 TEST_FLAG_PARAM :=
 endif
-COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) "-DJDK_VENDOR=$(JDK_VENDOR)" -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
+COMPILE_CMD=ant -f scripts$(D)build_test.xml -DTEST_ROOT=$(TEST_ROOT) -DBUILD_ROOT=$(BUILD_ROOT) -DJDK_VERSION=$(JDK_VERSION) -DJDK_IMPL=$(JDK_IMPL) $(Q)-DJDK_VENDOR=$(JDK_VENDOR)$(Q) -DJCL_VERSION=$(JCL_VERSION) -DBUILD_LIST=${COMPILE_BUILD_LIST} -DRESOURCES_DIR=${RESOURCES_DIR} -DSPEC=${SPEC} -DTEST_JDK_HOME=${TEST_JDK_HOME} -DJVM_VERSION=$(JVM_VERSION) -DLIB_DIR=$(LIB_DIR) ${TEST_FLAG_PARAM}
 
 
 compile: