Skip to content

Commit a3fd345

Browse files
authored
Merge pull request #18737 from pshipton/gcc11doc
Update build instructions for gcc 11, and 10.3 for Aarch64 Linux
2 parents 0cbeed0 + d582f4d commit a3fd345

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

doc/build-instructions/Build_Instructions_V11.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ If you want to build a binary by using a Docker container, follow these steps to
7373

7474
2. Next, run the following command to build a Docker image, called **openj9**:
7575
```
76-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=16.04 --gitcache=no --jdk=11 --build
76+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=11 --build
7777
```
7878

7979
3. Start a Docker container from the **openj9** image with the following command, where `-v` maps any directory, `<host_directory>`,
@@ -91,7 +91,7 @@ Now that you have the Docker image running, you are ready to move to the next st
9191
If you don't want to user Docker, you can still build directly on your Ubuntu system or in a Ubuntu virtual machine. Use the output of the following command like a recipe card to determine the software dependencies that must be installed on the system, plus a few configuration steps.
9292

9393
```
94-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=16.04 --gitcache=no --jdk=11 --print
94+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=11 --print
9595
```
9696

9797
1. Install the list of dependencies that can be obtained with the `apt-get` command from the following section of the Dockerfile:
@@ -101,11 +101,11 @@ apt-get update \
101101
...
102102
```
103103

104-
2. The previous step installed g++-7 and gcc-7 packages, which might be different
104+
2. The previous step installed g++-11 and gcc-11 packages, which might be different
105105
than the default version installed on your system. Export variables to set the
106106
version used in the build.
107107
```
108-
export CC=gcc-7 CXX=g++-7
108+
export CC=gcc-11 CXX=g++-11
109109
```
110110

111111
3. Only when building with `--with-cmake=no`, download and setup `freemarker.jar` into a directory.
@@ -727,7 +727,7 @@ bash get_source.sh
727727

728728
You must install a number of software dependencies to create a suitable build environment on your AArch64 Linux system:
729729

730-
- GNU C/C++ compiler (The Docker image uses GCC 7.5)
730+
- GNU C/C++ compiler 10.3 (The Docker image uses GCC 7.5)
731731
- [AArch64 Linux JDK](https://api.adoptopenjdk.net/v3/binary/latest/11/ga/linux/aarch64/jdk/openj9/normal/adoptopenjdk), which is used as the boot JDK.
732732
- [Freemarker V2.3.8](https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download) - Only when building with `--with-cmake=no`
733733

doc/build-instructions/Build_Instructions_V17.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ If you want to build a binary by using a Docker container, follow these steps to
7272

7373
2. Next, run the following command to build a Docker image, called **openj9**:
7474
```
75-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=20 --gitcache=no --jdk=17 --build
75+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=17 --build
7676
```
7777

7878
3. Start a Docker container from the **openj9** image with the following command, where `-v` maps any directory, `<host_directory>`,
@@ -90,7 +90,7 @@ Now that you have the Docker image running, you are ready to move to the next st
9090
If you don't want to user Docker, you can still build directly on your Ubuntu system or in a Ubuntu virtual machine. Use the output of the following command like a recipe card to determine the software dependencies that must be installed on the system, plus a few configuration steps.
9191

9292
```
93-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=20 --gitcache=no --jdk=17 --print
93+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=17 --print
9494
```
9595

9696
1. Install the list of dependencies that can be obtained with the `apt-get` command from the following section of the Dockerfile:
@@ -100,11 +100,11 @@ apt-get update \
100100
...
101101
```
102102

103-
2. The previous step installed g++-10 and gcc-10 packages, which might be different
103+
2. The previous step installed g++-11 and gcc-11 packages, which might be different
104104
than the default version installed on your system. Export variables to set the
105105
version used in the build.
106106
```
107-
export CC=gcc-10 CXX=g++-10
107+
export CC=gcc-11 CXX=g++-11
108108
```
109109

110110
3. Download and setup the boot JDK using the latest AdoptOpenJDK v17 build.
@@ -721,7 +721,7 @@ bash get_source.sh
721721

722722
You must install a number of software dependencies to create a suitable build environment on your AArch64 Linux system:
723723

724-
- GNU C/C++ compiler (The Docker image uses GCC 7.5)
724+
- GNU C/C++ compiler 10.3 (The Docker image uses GCC 7.5)
725725
- [AArch64 Linux JDK](https://api.adoptopenjdk.net/v3/binary/latest/17/ga/linux/aarch64/jdk/openj9/normal/adoptopenjdk), which is used as the boot JDK.
726726
- [Freemarker V2.3.8](https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download) - Only when building with `--with-cmake=no`
727727

doc/build-instructions/Build_Instructions_V21.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ If you want to build a binary by using a Docker container, follow these steps to
7272

7373
2. Next, run the following command to build a Docker image, called **openj9**:
7474
```
75-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=20 --gitcache=no --jdk=21 --build
75+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=21 --build
7676
```
7777

7878
3. Start a Docker container from the **openj9** image with the following command, where `-v` maps any directory, `<host_directory>`,
@@ -90,7 +90,7 @@ Now that you have the Docker image running, you are ready to move to the next st
9090
If you don't want to user Docker, you can still build directly on your Ubuntu system or in a Ubuntu virtual machine. Use the output of the following command like a recipe card to determine the software dependencies that must be installed on the system, plus a few configuration steps.
9191

9292
```
93-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=20 --gitcache=no --jdk=21 --print
93+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=21 --print
9494
```
9595

9696
1. Install the list of dependencies that can be obtained with the `apt-get` command from the following section of the Dockerfile:
@@ -100,11 +100,11 @@ apt-get update \
100100
...
101101
```
102102

103-
2. The previous step installed g++-10 and gcc-10 packages, which might be different
103+
2. The previous step installed g++-11 and gcc-11 packages, which might be different
104104
than the default version installed on your system. Export variables to set the
105105
version used in the build.
106106
```
107-
export CC=gcc-10 CXX=g++-10
107+
export CC=gcc-11 CXX=g++-11
108108
```
109109

110110
3. Download and setup the boot JDK using the latest AdoptOpenJDK v20 build.
@@ -721,7 +721,7 @@ bash get_source.sh
721721

722722
You must install a number of software dependencies to create a suitable build environment on your AArch64 Linux system:
723723

724-
- GNU C/C++ compiler (The Docker image uses GCC 7.5)
724+
- GNU C/C++ compiler 10.3 (The Docker image uses GCC 7.5)
725725
- [AArch64 Linux JDK](https://api.adoptopenjdk.net/v3/binary/latest/20/ga/linux/aarch64/jdk/openj9/normal/adoptopenjdk), which is used as the boot JDK.
726726
- [Freemarker V2.3.8](https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download) - Only when building with `--with-cmake=no`
727727

doc/build-instructions/Build_Instructions_V8.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ If you want to build a binary by using a Docker container, follow these steps to
7373

7474
2. Next, run the following command to build a Docker image, called **openj9**:
7575
```
76-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=16.04 --gitcache=no --jdk=8 --build
76+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=8 --build
7777
```
7878

7979
3. Start a Docker container from the **openj9** image with the following command, where `-v` maps any directory, `<host_directory>`,
@@ -91,7 +91,7 @@ Now that you have the Docker image running, you are ready to move to the next st
9191
If you don't want to user Docker, you can still build directly on your Ubuntu system or in a Ubuntu virtual machine. Use the output of the following command like a recipe card to determine the software dependencies that must be installed on the system, plus a few configuration steps.
9292

9393
```
94-
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=16.04 --gitcache=no --jdk=8 --print
94+
bash mkdocker.sh --tag=openj9 --dist=ubuntu --version=22 --gitcache=no --jdk=8 --print
9595
```
9696

9797
1. Install the list of dependencies that can be obtained with the `apt-get` command from the following section of the Dockerfile:
@@ -102,11 +102,11 @@ apt-get update \
102102
...
103103
```
104104

105-
2. The previous step installed g++-7 and gcc-7 packages, which might be different
105+
2. The previous step installed g++-11 and gcc-11 packages, which might be different
106106
than the default version installed on your system. Export variables to set the
107107
version used in the build.
108108
```
109-
export CC=gcc-7 CXX=g++-7
109+
export CC=gcc-11 CXX=g++-11
110110
```
111111

112112
3. Only when building with `--with-cmake=no`, download and setup `freemarker.jar` into a directory. The example commands use `/root` to be consistent with the Docker instructions. If you aren't using Docker, you probably want to store the `freemarker.jar` in your home directory.
@@ -751,7 +751,7 @@ bash get_source.sh
751751

752752
You must install a number of software dependencies to create a suitable build environment on your AArch64 Linux system:
753753

754-
- GNU C/C++ compiler
754+
- GNU C/C++ compiler 10.3 (The Docker image uses GCC 7.5)
755755
- [AArch64 Linux JDK](https://api.adoptopenjdk.net/v3/binary/latest/8/ga/linux/aarch64/jdk/hotspot/normal/adoptopenjdk), which is used as the boot JDK.
756756
- [Freemarker V2.3.8](https://sourceforge.net/projects/freemarker/files/freemarker/2.3.8/freemarker-2.3.8.tar.gz/download) - Only when building with `--with-cmake=no`
757757

0 commit comments

Comments
 (0)