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

Adding to Freetype windows role #566

Merged
merged 1 commit into from
Nov 16, 2018
Merged

Conversation

cwesMills
Copy link
Contributor

@cwesMills cwesMills commented Nov 13, 2018

JDK8 compile will fail unless freetype is built beforehand, so these changes
will build freetype 32bit and 64bit versions inside C:\openjdk\freetype-2.5.3
Fixes #367
Signed-off-by: Colton Mills millscolt3@gmail.com

JDK8 compile will fail unless freetype is built beforehand, so these changes
will build freetype 32bit and 64bit versions inside C:\openjdk\freetype-2.5.3

Signed-off-by: Colton Mills <millscolt3@gmail.com>
Copy link
Contributor

@jdekonin jdekonin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. I am a little concerned over the fact that the 64bit versions are in fact 32bit. Although building JDK8 or JDK11, it seems not to matter.

@karianna
Copy link
Contributor

How are the 64bit versions actually 32bit? That would probably be an issue. Is this change to support OpenJ9 builds only? I'd probably get @ali-ince and @johnoliver to review this as well if the builds are relying on this...

@jdekonin
Copy link
Contributor

Its a requirement for openjdk as I understand it. Microsoft Visual Studio 10.0 is 32bit only. @cwesMills could you test compiling these like you did with the OpenSSL role using Microsoft Visual Studio 12 which has for 32 & 64 bit support?

@cwesMills
Copy link
Contributor Author

cwesMills commented Nov 14, 2018

Visual Studio 12 gives the same result. When running file lib32/freetype.dll, the output is lib32/freetype.dll: PE32 executable (DLL) (GUI) Intel 80386, for MS Windows, and file lib64/freetype.dll outputs lib64/freetype.dll: PE32+ executable (DLL) (GUI) x86-64, for MS Windows. It also seems we have the same problem with the OpenSSL install.

@cwesMills
Copy link
Contributor Author

It turns out the PE32+ executable is actually 64bit, we were just confused by the naming convention.

@jdekonin
Copy link
Contributor

Okay, I'm good with this solution.

@sxa sxa self-requested a review November 16, 2018 10:43
Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this was all based on my issue I can't really object, therefore approving too ;-)

@sxa sxa mentioned this pull request Nov 16, 2018
@jdekonin jdekonin merged commit 51e9748 into adoptium:master Nov 16, 2018
@cwesMills cwesMills deleted the freetype-build branch November 23, 2018 15:35
jdekonin added a commit to jdekonin/adoptium-infrastructure that referenced this pull request Oct 18, 2019
Playbook changes for xLinux Java8 machines
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants