Skip to content

Commit

Permalink
build jdk-11.0.3+6
Browse files Browse the repository at this point in the history
  • Loading branch information
pinhead84 committed Apr 7, 2019
1 parent a489af8 commit 0591030
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 17 deletions.
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 6 additions & 5 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion openjdk-build

0 comments on commit 0591030

Please sign in to comment.