diff --git a/README.md b/README.md index 66b23f4..c82bb2f 100644 --- a/README.md +++ b/README.md @@ -84,17 +84,6 @@ You may build OpenJDK for Linux x86 on a x86-64 system natively. On Debian **amd zlib1g-dev:i386 ``` -- After cloning this repository you need to update the `prepareWorkspace.sh` script by AdoptOpenJDK in order to enforce a 32bit build of the Freetype library. - - ```bash - cd "openjdk-build" - git submodule update --init --recursive - sed -i.bak 's|if ! (bash ./configure |if ! (CC="gcc -m32" bash ./configure |' \ - "sbin/prepareWorkspace.sh" - ``` - - This updates the [Freetype compilation in `prepareWorkspace.sh`](https://github.com/AdoptOpenJDK/openjdk-build/blob/e8d4621ae2aff0e89b6dabd4bf802fc2ac8077d5/sbin/prepareWorkspace.sh#L229) accordingly. - - Start the build script from this repository with: ```bash diff --git a/build.sh b/build.sh index c49f2ba..2076111 100755 --- a/build.sh +++ b/build.sh @@ -16,7 +16,8 @@ # OPENJDK_VERSION="jdk11u" -OPENJDK_TAG="jdk-11.0.2+9" +OPENJDK_TAG="jdk-11.0.3+6" +OPENJDK_NAME="jdk-11.0.3" #OPENJDK_CONFIGURE_ARGS="" OPENJDK_CONFIGURE_ARGS="--disable-warnings-as-errors" @@ -52,14 +53,14 @@ cd "${DIR}/openjdk-build" IMAGE_NAME="$( ls -1 "${DIR}/openjdk-build/workspace/build/src/build" )" IMAGE_DIR="${DIR}/openjdk-build/workspace/build/src/build/${IMAGE_NAME}/images" mkdir -p "${TARGET_DIR}" -if [[ -d "${IMAGE_DIR}/${OPENJDK_TAG}" ]] ; then +if [[ -d "${IMAGE_DIR}/${OPENJDK_NAME}" ]] ; then cd "${IMAGE_DIR}" echo "Copy JDK image to ${TARGET_DIR}/${TARGET_FILE_JDK}" - tar cfz "${TARGET_DIR}/${TARGET_FILE_JDK}" "${OPENJDK_TAG}" + tar cfz "${TARGET_DIR}/${TARGET_FILE_JDK}" "${OPENJDK_NAME}" fi -if [[ -d "${IMAGE_DIR}/${OPENJDK_TAG}-jre" ]] ; then +if [[ -d "${IMAGE_DIR}/${OPENJDK_NAME}-jre" ]] ; then cd "${IMAGE_DIR}" echo "Copy JRE image to ${TARGET_DIR}/${TARGET_FILE_JRE}" - tar cfz "${TARGET_DIR}/${TARGET_FILE_JRE}" "${OPENJDK_TAG}-jre" + tar cfz "${TARGET_DIR}/${TARGET_FILE_JRE}" "${OPENJDK_NAME}-jre" fi diff --git a/openjdk-build b/openjdk-build index e8d4621..205429f 160000 --- a/openjdk-build +++ b/openjdk-build @@ -1 +1 @@ -Subproject commit e8d4621ae2aff0e89b6dabd4bf802fc2ac8077d5 +Subproject commit 205429fe32e2ccc6598a9d5f29c59b6b790ec5c9