Don't bundle zlib for OpenJ9 builds (#3483)

AdamBrousseau · web-flow · commit 5f79368a46fe · 2023-09-27T11:12:48.000+01:00
Related #3459 eclipse-openj9/openj9#18127 Signed-off-by: Adam Brousseau <adam.brousseau88@gmail.com>
diff --git a/sbin/build.sh b/sbin/build.sh
@@ -552,8 +552,10 @@ configureFreetypeLocation() {
 }
 
 configureZlibLocation() {
-  if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then
-    addConfigureArg "--with-zlib=" "bundled"
+  if [[ "${BUILD_CONFIG[BUILD_VARIANT]}" != "${BUILD_VARIANT_OPENJ9}" ]]; then
+    if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then
+      addConfigureArg "--with-zlib=" "bundled"
+    fi
   fi
 }
 

Original file line number	Diff line number	Diff line change
`@@ -552,8 +552,10 @@ configureFreetypeLocation() {`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`configureZlibLocation() {`
`555`		`- if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then`
`556`		`- addConfigureArg "--with-zlib=" "bundled"`
	`555`	`+ if [[ "${BUILD_CONFIG[BUILD_VARIANT]}" != "${BUILD_VARIANT_OPENJ9}" ]]; then`
	`556`	`+ if [[ ! "${CONFIGURE_ARGS}" =~ "--with-zlib" ]]; then`
	`557`	`+ addConfigureArg "--with-zlib=" "bundled"`
	`558`	`+ fi`
`557`	`559`	`fi`
`558`	`560`	`}`
`559`	`561`