Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include freetype source from openjdk #631

Merged
merged 1 commit into from
Nov 10, 2022

Conversation

keithc-ca
Copy link
Member

@keithc-ca keithc-ca commented Oct 24, 2022

  • same source as included in jdk11+
  • remove --with-freetype-src configure option
  • --with-free-type= accepts only bundled or system, consistent with other versions

Must be merge concurrently with eclipse-openj9/openj9#16182.

@keithc-ca
Copy link
Member Author

jenkins test sanity aix,alinux64,osx,win,win32 jdk8 depends eclipse-openj9/openj9#16182

@keithc-ca
Copy link
Member Author

Build dependency doesn't seem to have had the desired affect on configure options; trying macOS & Windows in eclipse-openj9/openj9#16182.

jdk/THIRD_PARTY_README Outdated Show resolved Hide resolved
@pshipton
Copy link
Member

We'll need to modify https://github.com/ibmruntimes/temurin-build/ concurrently as well or the Semeru builds will break.

@pshipton
Copy link
Member

pshipton commented Oct 24, 2022

Like jdk11+, we can use --skip-freetype, in build-farm/platform-specific-configurations/windows.sh and mac.sh, or set it as default for all platforms.

jdk/THIRD_PARTY_README Outdated Show resolved Hide resolved
@keithc-ca
Copy link
Member Author

Updated jdk/THIRD_PARTY_README.

@keithc-ca
Copy link
Member Author

@pshipton
Copy link
Member

Ok. Now we need to wait for the 0.35 build to be finalized so these changes don't break those builds.

@gdams
Copy link
Contributor

gdams commented Oct 31, 2022

@keithc-ca do you intend to upstream this to mainstream OpenJDK8 development? It's something the updates project have been hoping to do for some time.

@keithc-ca
Copy link
Member Author

do you intend to upstream this to mainstream OpenJDK8 development?

It would seem a reasonable course of action; I'll see if I can find some help to make that happen.

@gdams
Copy link
Contributor

gdams commented Oct 31, 2022

It would seem a reasonable course of action; I'll see if I can find some help to make that happen.

Sounds good, more than happy to help @keithc-ca

* remove '--with-freetype-src' configure option

Signed-off-by: Keith W. Campbell <keithc@ca.ibm.com>
@keithc-ca
Copy link
Member Author

Rebased and updated to reflect licence changes in ibmruntimes/openj9-openjdk-jdk11@1f8e807.

@andrew-m-leonard
Copy link
Contributor

What version of Freetype is this src ?

@pshipton
Copy link
Member

pshipton commented Nov 7, 2022

What version of Freetype is this src ?

2.12.1 Same as used by jdk11, 17, 19+
See the update to THIRD_PARTY_README

@andrew-m-leonard
Copy link
Contributor

@gdams Do you have a link to updates maillist discussions on this? thanks

@gdams
Copy link
Contributor

gdams commented Nov 8, 2022

@andrew-m-leonard see the discussion in openjdk/jdk8u-dev#3 (comment)

@pshipton pshipton merged commit b0d50c4 into ibmruntimes:openj9 Nov 10, 2022
@keithc-ca keithc-ca deleted the freetype branch November 10, 2022 19:24
@gnu-andrew
Copy link
Contributor

It would seem a reasonable course of action; I'll see if I can find some help to make that happen.

Sounds good, more than happy to help @keithc-ca

It would definitely be good to see this upstream and should allow us to remove the need to build FreeType within the GitHub Actions for Windows.

I think this would primarily be a backport of JDK-8193017, though we can reference further bugs to note that we also have updates to later versions. A PR with the subject "Backport 58ff4ee8c4ec399528338b59eadea996110366a0" against openjdk/jdk8u-dev should start the ball rolling; see the SKARA backport process for details.

pshipton added a commit to pshipton/openj9 that referenced this pull request May 10, 2023
freetype is automatically include in jdk8 builds since
ibmruntimes/openj9-openjdk-jdk8#631

Obsoletes eclipse-openj9#17329

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
@gdams
Copy link
Contributor

gdams commented May 24, 2023

It would seem a reasonable course of action; I'll see if I can find some help to make that happen.

Sounds good, more than happy to help @keithc-ca

It would definitely be good to see this upstream and should allow us to remove the need to build FreeType within the GitHub Actions for Windows.

I think this would primarily be a backport of JDK-8193017, though we can reference further bugs to note that we also have updates to later versions. A PR with the subject "Backport 58ff4ee8c4ec399528338b59eadea996110366a0" against openjdk/jdk8u-dev should start the ball rolling; see the SKARA backport process for details.

As nobody has picked this up yet I'll have a go at the backport process to jdk8u-dev

midronij pushed a commit to midronij/openj9 that referenced this pull request May 24, 2023
freetype is automatically include in jdk8 builds since
ibmruntimes/openj9-openjdk-jdk8#631

Obsoletes eclipse-openj9#17329

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
midronij pushed a commit to midronij/openj9 that referenced this pull request Jun 1, 2023
freetype is automatically include in jdk8 builds since
ibmruntimes/openj9-openjdk-jdk8#631

Obsoletes eclipse-openj9#17329

Signed-off-by: Peter Shipton <Peter_Shipton@ca.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants