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

Fix compilation with llvm > 6 (and arch=i386) #32807

Merged
merged 1 commit into from Nov 20, 2019
Merged

Conversation

lbartoletti
Copy link
Member

Follow up https://www.mail-archive.com/qgis-developer@lists.osgeo.org/msg47062.html discussion

I will test (for build time) this method "-mllvm -inline-threshold=128" , and "-O1"\ in another one.

cc @m-kuhn @rhurlin @landryb

Description

Checklist

  • Commit messages are descriptive and explain the rationale for changes
  • Commits which fix bugs include Fixes #11111 at the bottom of the commit message
  • I have read the QGIS Coding Standards and this PR complies with them
  • New unit tests have been added for core changes
  • I have run the scripts/prepare-commit.sh script before each commit
  • I have evaluated whether it is appropriate for this PR to be backported, backport requests are left as label or comment

Follow up https://www.mail-archive.com/qgis-developer@lists.osgeo.org/msg47062.html discussion

I will test (for build time) this method `"-mllvm -inline-threshold=128"` , and \"-O1"\ in another one.

cc @m-kuhn @rhurlin @landryb
@landryb
Copy link
Contributor

landryb commented Nov 13, 2019

@lbartoletti
Copy link
Member Author

@rhurlin
Copy link
Contributor

rhurlin commented Nov 13, 2019

Alternative approach: https://github.com/opengisch/OSGeo4A/blob/master/recipes/qgis/patches/0001-Use-qrc-for-crs-mapping.patch

I just tried this patch on FreeBSD 13.0-CURRENT amd64 and it applies and builds fine. Will try i386 (11.3, 12.1) later, when at home again.

@lbartoletti
Copy link
Member Author

lbartoletti commented Nov 13, 2019

Nice @m-kuhn !
I think the next time I see you, you will receive some BSD 😈 🐡 badges/stickers 😉

@m-kuhn
Copy link
Member

m-kuhn commented Nov 13, 2019

Nice @m-kuhn !
I think the next time I see you, you will receive some BSD smiling_imp blowfish badges/stickers wink

Yay 🎉 🗡️ 😈

@rhurlin
Copy link
Contributor

rhurlin commented Nov 14, 2019

On FreeBSD with Poudriere, I have problems building for i386 with this patch (0001-Use-qrc-for-crs-mapping.patch). It takes hours and hours ...

@lbartoletti
Copy link
Member Author

@rhurlin @m-kuhn OK so the patch is not acceptable for i386. I'll try third solutions on my machine this week-end.

For now, best solution seems "-mllvm -inline-threshold=128" (I'll launch a build with "-O1")

@lbartoletti lbartoletti changed the title [TEST] Fix compilation with llvm > 6 (and arch=i386) Fix compilation with llvm > 6 (and arch=i386) Nov 20, 2019
@lbartoletti
Copy link
Member Author

@rhurlin Do you agree with "-mllvm -inline-threshold=128" solution, since "-O1" is longer and the patch from mathias doesn't works for i386 arch (very longer)?

@rhurlin
Copy link
Contributor

rhurlin commented Nov 20, 2019

@rhurlin Do you agree with "-mllvm -inline-threshold=128" solution, since "-O1" is longer and the patch from mathias doesn't works for i386 arch (very longer)?

For me this patch is fine. It passes several Poudriere runs with i368 and amd64 on FreeBSD. Thank you very much!

@lbartoletti
Copy link
Member Author

@m-kuhn can you merge it when travis will be happy please?
@rhurlin thanks for testing.

And most of all, thanks to OpenBSD 🐡 cc @landryb ;)

@m-kuhn
Copy link
Member

m-kuhn commented Nov 20, 2019

Thanks everyone!!

@lbartoletti lbartoletti deleted the patch-1 branch November 20, 2019 09:38
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.

None yet

4 participants