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.

Sign up for GitHub

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

Jump to bottom

glm: fix gcc 7.3 support #35420

Merged
merged 1 commit into from Feb 26, 2018
Merged

glm: fix gcc 7.3 support #35420

merged 1 commit into from Feb 26, 2018

Conversation

sifmelcara
Copy link
Member

@sifmelcara sifmelcara commented Feb 23, 2018 •
edited

Motivation for this change

slop fails to build after switching to gcc 7.3

The reason seems to be that glm did not correctly support gcc 7.3 . Although this issue have been fixed by upstream in g-truc/glm@dd48b56 , they haven't release any stable version contains the fix.
This PR fixes the issue by fetching new version of platform.h. (patches and fetchpatch cannot be used because that commit have some content which cannot be automatically merged)

cc maintainer @Fuuzetsu

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vcunat
Copy link
Member

vcunat commented Feb 23, 2018 •
edited

BTW, tag 0.9.9-a2 is not a release? (only alpha, I suppose)

@sifmelcara
Copy link
Member Author

Yeah, I guess it means alpha.

@sifmelcara
Copy link
Member Author

Hmm, both of my machines failed nox-review

make[1]: *** [/tmp/nix-build-libreoffice-5.3.6.1.drv-0/libreoffice-5.3.6.1/postprocess/CustomTarget_images.mk:37: /tmp/nix-build-libreoffice-5.3.6.1.drv-0/libreoffice-5.3.6.1/workdir/CustomTarget/postprocess/images/images_breeze_dark.zip] Error 5
make: *** [Makefile:267: build] Error 2
note: build failure may have been caused by lack of free disk space
builder for ‘/nix/store/lzbk658mdq61cndrmqrzmqyc6mj273aa-libreoffice-5.3.6.1.drv’ failed with exit code 2
error: build of ‘/nix/store/lzbk658mdq61cndrmqrzmqyc6mj273aa-libreoffice-5.3.6.1.drv’ failed

Not sure what is the cause of the failure.

@vcunat
Copy link
Member

vcunat commented Feb 24, 2018

note: build failure may have been caused by lack of free disk space

Too small /tmp?

@sifmelcara
Copy link
Member Author

I don't think so.. I have tried to remount /tmp to 10GB, still have out of space error

@Fuuzetsu
Copy link
Member

It might not be using /tmp, for example on NixOS. Set TMPDIR. I would prefer a tagged version. I don't really know anything about this package, I was merely listed as maintainer so I could receive updates when new versions came out upstream from a monitoring tool we had so I can't offer much insight into any specifics.

@sifmelcara
Copy link
Member Author

sifmelcara commented Feb 25, 2018 •
edited

After I run nox-review on a linux machine with more than 60GB /tmp, it passed. It turns out even 10GB space may not be enough to build libreoffice.
Ok, so I will try to go for 0.9.9a2, and test if things like libreoffice and slop still work.

@sifmelcara sifmelcara changed the title glm: fix gcc 7.3 support glm: add version 0.9.9-a2 which supports gcc 7.3 Feb 25, 2018
@sifmelcara
Copy link
Member Author

I ended up adding another version of glm, and use that new version of glm to build slop.

@sifmelcara sifmelcara force-pushed the fix/slop branch 2 times, most recently from 5873185 to c077094 Compare February 25, 2018 05:51
@sifmelcara
Copy link
Member Author

Sorry for the mess, in fact we still need to patch 0.9.5.

We should patch the glm-0.9.5, not update to glm-0.9.9-a2 because:

  • openrw, kicad-unstable, gource, and logstalgia: they depend on glm, currently fails to build on master, works if we patch 0.9.5, fails if we update glm to 0.9.9-a2
  • slop and maim: depend on glm, currently fails to build on master, works if we patch 0.9.5 or update to 0.9.9-a2
  • libreoffice, odpdown, arx-libertatis and libreoffice: depend on glm, always success to build

So the only way to make all packages depends on glm builds with gcc 7.3, is to patch glm 0.9.5

@sifmelcara sifmelcara changed the title glm: add version 0.9.9-a2 which supports gcc 7.3 glm: fix gcc 7.3 support Feb 25, 2018
@sifmelcara
glm: fix gcc 7.3 support
f76f4ec 
This will also fix several packages' build
@sifmelcara
Copy link
Member Author

I think this is ready to be merged.
(To sum up, this PR will fix the build of openrw, kicad-unstable, gource, logstalgia, slop and maim.)

@vcunat vcunat merged commit f76f4ec into NixOS:master Feb 26, 2018
vcunat added a commit that referenced this pull request Feb 26, 2018
@vcunat
Merge #35420: glm: fix gcc 7 support
8be317a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sifmelcara @vcunat @Fuuzetsu @srid @GrahamcOfBorg