Skip to content

Commit

Permalink
Merge pull request #16182 from keithc-ca/freetype
Browse files Browse the repository at this point in the history
Remove uses of unsupported freetype configure options
  • Loading branch information
pshipton authored Nov 10, 2022
2 parents c23ec23 + a350979 commit dc27a6c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
6 changes: 3 additions & 3 deletions buildenv/jenkins/variables/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ x86-64_windows:
freemarker: '/cygdrive/c/openjdk/freemarker.jar'
extra_configure_options:
all: '--disable-ccache --with-cuda="C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.0"'
8: '--with-toolchain-version=2017 --with-freetype-src=/cygdrive/c/openjdk/freetype-2.5.3'
8: '--with-toolchain-version=2017'
11: '--with-toolchain-version=2019'
17: '--with-toolchain-version=2019'
18: '--with-toolchain-version=2019'
Expand All @@ -378,7 +378,7 @@ x86-32_windows:
release:
8: 'windows-x86-normal-server-release'
extra_configure_options:
8: '--with-toolchain-version=2017 --with-freetype-src=/cygdrive/c/openjdk/freetype-2.5.3 --with-target-bits=32 --disable-ccache'
8: '--with-toolchain-version=2017 --with-target-bits=32 --disable-ccache'
freemarker: '/cygdrive/c/openjdk/freemarker.jar'
node_labels:
build:
Expand All @@ -401,7 +401,7 @@ x86-64_mac:
8: 'macosx-x86_64-normal-server-release'
11: 'macosx-x86_64-normal-server-release'
extra_configure_options:
8: '--with-toolchain-type=clang --with-freetype=/usr/local/freetype-2.9.1'
8: '--with-toolchain-type=clang'
freemarker: '/Users/jenkins/freemarker.jar'
openjdk_reference_repo: '/Users/jenkins/openjdk_cache'
node_labels:
Expand Down
6 changes: 1 addition & 5 deletions doc/build-instructions/Build_Instructions_V8.md
Original file line number Diff line number Diff line change
Expand Up @@ -471,15 +471,13 @@ When you have all the source files that you need, run the configure script, whic
1) Win 64-bit
```
bash configure --disable-ccache \
--with-boot-jdk=/cygdrive/c/<path to_jdk8> \
--with-freetype-src=/cygdrive/c/temp/freetype
--with-boot-jdk=/cygdrive/c/<path to_jdk8>
```

2) Win 32-bit
```
bash configure --disable-ccache \
--with-boot-jdk=/cygdrive/c/<path_to_jdk8> \
--with-freetype-src=/cygdrive/c/temp/freetype \
--with-target-bits=32
```
Note: If you have multiple versions of Visual Studio installed, you can enforce a specific version to be used by setting `--with-toolchain-version`, i.e., by including `--with-toolchain-version=2013` option in the configure command.
Expand Down Expand Up @@ -660,8 +658,6 @@ When you have all the source files that you need, run the configure script, whic
bash configure \
TAR=gtar \
--with-boot-jdk=<path_to_boot_JDK8> \
--with-freetype-include=/usr/local/include/freetype2 \
--with-freetype-lib=/usr/local/lib \
--with-toolchain-type=clang
```

Expand Down

0 comments on commit dc27a6c

Please sign in to comment.