# HG changeset patch # User goetz # Date 1523869687 -7200 # Mon Apr 16 11:08:07 2018 +0200 # Node ID 2820891fc1b877f2f8fdcc008b9311d809120015 # Parent 4beba2c2a329d629bc271a87bb9e328b9c17674f 8201584: Fix configure on SLES 11 after 8201483 diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4 --- a/make/autoconf/hotspot.m4 +++ b/make/autoconf/hotspot.m4 @@ -443,7 +443,10 @@ AC_MSG_RESULT(["$JVM_FEATURES_FOR_VARIANT"]) # Validate features (for configure script errors, not user errors) - INVALID_FEATURES=`$GREP -Fvx "${VALID_JVM_FEATURES// /$'\n'}" <<< "${JVM_FEATURES_FOR_VARIANT// /$'\n'}"` + # Notice that the original variant fails on SLES 10 and 11 + NEEDLE=${VALID_JVM_FEATURES// /$'\n'} + STACK=${JVM_FEATURES_FOR_VARIANT// /$'\n'} + INVALID_FEATURES=`$GREP -Fvx "${NEEDLE}" <<< "${STACK}"` if test "x$INVALID_FEATURES" != x; then AC_MSG_ERROR([Internal configure script error. Invalid JVM feature(s): $INVALID_FEATURES]) fi