Skip to content

Add patch to fix windows.h include in freetype#10075

Merged
adamjstewart merged 2 commits intospack:developfrom
adamjstewart:packages/freetype
Dec 17, 2018
Merged

Add patch to fix windows.h include in freetype#10075
adamjstewart merged 2 commits intospack:developfrom
adamjstewart:packages/freetype

Conversation

@adamjstewart
Copy link
Copy Markdown
Member

@adamjstewart adamjstewart commented Dec 11, 2018

Fixes #9729.

I took the patch from https://savannah.nongnu.org/bugs/index.php?54967, generated a new configure script, and produced a new patch of the relevant changes. This way, we don't need to add m4, libtool, autoconf, and automake dependencies needed by the previous patch.

With this patch, I was able to successfully install freetype with GCC 4.9.3 on Cray CNL5 (Blue Waters).

@jrood-nrel

@adamjstewart adamjstewart changed the title Add patch to fix windows.h include in freetype [WIP] Add patch to fix windows.h include in freetype Dec 13, 2018
@adamjstewart
Copy link
Copy Markdown
Member Author

adamjstewart commented Dec 13, 2018

Hold on, now I'm seeing issues with GCC 7.3.0. Let me see if those issues were caused by this patch.

@adamjstewart
Copy link
Copy Markdown
Member Author

adamjstewart commented Dec 14, 2018

Okay, for GCC 7.3.0, with or without this patch, the issue still occurs. Let me try the original patch. We'll just have to regenerate configure each time.

@adamjstewart adamjstewart changed the title [WIP] Add patch to fix windows.h include in freetype Add patch to fix windows.h include in freetype Dec 15, 2018
@adamjstewart
Copy link
Copy Markdown
Member Author

adamjstewart commented Dec 15, 2018

Okay, I think I have the correct patch this time. @jrood-nrel Can you try this and see if it works for you?

@jrood-nrel
Copy link
Copy Markdown
Member

jrood-nrel commented Dec 17, 2018 •
edited
Loading

This is on CentOS 7 and I'm using GCC 4.8.5. Double checked I still see the error:

spack/var/spack/stage/freetype-2.9.1-edd2aa6dtopjst5qp3tn2duk2w2mc3mm/freetype-2.9.1/src/base/ftver.rc:19:2
            0: fatal error: windows.h: No such file or directory

Checked out this PR:

==> Installing freetype
==> Searching for binary cache of freetype
==> Warning: No Spack mirrors are currently configured
==> No binary for freetype found: installing from source
==> Using cached archive: /home/user/.spack/downloads/freetype/freetype-2.9.1.tar.gz
==> Staging archive: /home/user/spack/var/spack/stage/freetype-2.9.1-k2cvs2tu2zetysay3ojvzixssapvsij6/freetype-2.9.1.tar.gz
==> Created stage in /home/user/spack/var/spack/stage/freetype-2.9.1-k2cvs2tu2zetysay3ojvzixssapvsij6
==> Applied patch windows.patch
==> Building freetype [AutotoolsPackage]
==> Executing phase: 'autoreconf'
==> Executing phase: 'configure'
==> Executing phase: 'build'
==> Executing phase: 'install'
==> Successfully installed freetype
  Fetch: 0.01s.  Build: 12.80s.  Total: 12.81s.
[+] /home/user/spack/opt/spack/linux-centos7-x86_64/gcc-4.8.5/freetype-2.9.1-k2cvs2tu2zetysay3ojvzixssapvsij6

👍

@adamjstewart adamjstewart merged commit a8a0aee into spack:develop Dec 17, 2018
@adamjstewart adamjstewart deleted the packages/freetype branch December 17, 2018 19:00
tgamblin added a commit that referenced this pull request Dec 17, 2018
@tgamblin
Revert "Add patch to fix windows.h include in freetype (#10075)"
ec31f62 
This reverts commit a8a0aee.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

patch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@adamjstewart @jrood-nrel