Skip to content

Commit 394bf3d

Browse files
committed
Merge master HEAD into openj9-staging
Signed-off-by: J9 Build <[email protected]>
2 parents 4eba81e + 5110d8c commit 394bf3d

File tree

68 files changed

+2689
-770
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2689
-770
lines changed

configure

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -29,13 +29,17 @@
2929
# make sure that is called using bash.
3030

3131
# Get an absolute path to this script, since that determines the top-level directory.
32-
this_script_dir=`dirname $0`
33-
this_script_dir=`cd $this_script_dir > /dev/null && pwd`
32+
source_path="$(dirname ${0})"
33+
this_script_dir="$(cd -- "${source_path}" > /dev/null && pwd)"
34+
if test -z "${this_script_dir}"; then
35+
echo "Error: Could not determine location of configure script"
36+
exit 1
37+
fi
3438

3539
# Set CUSTOM_CONFIG_DIR for OpenJ9 extensions.
3640
export CUSTOM_CONFIG_DIR=$this_script_dir/closed/autoconf
3741

3842
# Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
3943
# This trick is needed to get autoconf to co-operate properly.
4044
# The ${-:+-$-} construction passes on bash options.
41-
bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
45+
bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@"

make/autoconf/configure

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
3+
# Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
44
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
55
#
66
# This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,12 @@ if test "x$BASH" = x; then
3939
echo "Error: This script must be run using bash." 1>&2
4040
exit 1
4141
fi
42+
43+
if [[ "$TOPDIR" =~ .*[[:space:]]+.* ]]; then
44+
echo "Error: Build path containing space character is not supported" 1>&2
45+
exit 1
46+
fi
47+
4248
# Force autoconf to use bash. This also means we must disable autoconf re-exec.
4349
export CONFIG_SHELL=$BASH
4450
export _as_can_reexec=no

0 commit comments

Comments
 (0)