Page MenuHomeFreeBSD
Differential D8322

Add __ARM_ARCH_6KZ__ to devel/qt4-corelib
ClosedPublic
Actions

Authored by tcberner on Oct 22 2016, 7:41 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sat, Oct 18, 5:16 PM
Unknown Object (File)
Thu, Oct 16, 12:23 PM
Unknown Object (File)
Mon, Oct 13, 8:38 PM
Unknown Object (File)
Sun, Oct 12, 1:30 PM
Unknown Object (File)
Sat, Oct 11, 10:59 PM
Unknown Object (File)
Thu, Oct 9, 10:11 PM
Unknown Object (File)
Tue, Oct 7, 12:09 AM
Unknown Object (File)
Fri, Oct 3, 6:38 PM
View All Files
Subscribers
adridg
mikael

Details

Reviewers
rakuco
mat
Group Reviewers
O5: Ports Framework(Owns No Changed Paths)
portmgr
Commits
rP442740: Fix qt4 ports on armv6.
Summary

Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform
used ARM_ARCH_6ZK instead of ARM_ARCH_6KZ.

Append the correct spellings to the checks for ARM_ARCH_6ZK.

Patch slightly modified from PR 210027 [2]

[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
[2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027

Test Plan

I have no armv6 platfrom to properly test.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 5683
Build 5971: arc lint + arc unit

Event Timeline

tcberner updated this revision to Diff 21611.Oct 22 2016, 7:41 AM
tcberner retitled this revision from to Add __ARM_ARCH_6KZ__ to devel/qt4-corelib.
tcberner updated this object.
tcberner edited the test plan for this revision. (Show Details)
tcberner added reviewers: rakuco, mat.
tcberner added a subscriber: adridg.
rakuco edited edge metadata.Oct 22 2016, 10:52 AM

FWIW, the gcc patch did get committed: https://github.com/gcc-mirror/gcc/commit/ab2874bae238c48204394aac7b235f78cc107f8d

With that said, are you sure patching qt4-corelib is the right option? It doesn't install the wtf/Platform.h, so to me it looks like qt4-script and qt4-webkit won't be fixed at all.

mikael added a subscriber: mikael.Oct 24 2016, 7:01 AM
adridg added a comment.May 31 2017, 12:35 PM

The important part of the patch is the change to qatomic; the wtf part might make more sense in the qt4-webkit and -script ports (simply duplicating the patch to the affected ports? it's all the same distfile, after all)

rakuco added a comment.Jun 1 2017, 3:19 PM
In D8322#227899, @groot_kde.org wrote:

The important part of the patch is the change to qatomic

This part looks fine to me. I think you need to bump PORTREVISION though, as I guess qt4-corelib currently builds fine on ARM, but the ports depending on it need to pick up the new header version.

the wtf part might make more sense in the qt4-webkit and -script ports (simply duplicating the patch to the affected ports? it's all the same distfile, after all)

I think it only makes sense in those ports: these headers are not installed, so you need to patch them during qt4-webkit/qt4-script's build for the changes to be picked up.

tcberner added a comment.Jun 1 2017, 7:40 PM

I'll try to look at all the arm-prs this weekend, and update the diff then.

tcberner updated this revision to Diff 29152.Jun 2 2017, 6:13 PM

Add extrapatch to qt4/files and include it for all qt4 ports.

Owners added a reviewer: O5: Ports Framework.Jun 2 2017, 6:13 PM
Herald added a reviewer: portmgr. · View Herald TranscriptJun 2 2017, 6:13 PM
Harbormaster completed remote builds in B9632: Diff 29152.Jun 2 2017, 6:13 PM
tcberner updated this revision to Diff 29153.Jun 2 2017, 6:21 PM

... remove the webkit hunk

tcberner updated this revision to Diff 29154.Jun 2 2017, 6:23 PM

Bump revision in qt4-corelib

tcberner added a comment.Jun 2 2017, 6:30 PM

Actually, probably only the bump to qt4-corelib is required, as the other stuff did not build anyways.

mikael added inline comments.Jun 2 2017, 6:50 PM
Mk/bsd.qt.mk
177 ↗(On Diff #29154)

Can we name it armv6 please

tcberner updated this revision to Diff 29156.Jun 2 2017, 6:54 PM

Call the path -armv6

Harbormaster completed remote builds in B9635: Diff 29156.Jun 2 2017, 6:54 PM
tcberner marked an inline comment as done.Jun 2 2017, 6:54 PM
tcberner added a comment.Jun 2 2017, 7:01 PM

@mikael.urankar_gmail.com did any of the qt4-* ports apart from qt4-corelib actually build? Or did they all fail during build?

mikael added a comment.Jun 2 2017, 7:14 PM
In D8322#228514, @tcberner wrote:

@mikael.urankar_gmail.com did any of the qt4-* ports apart from qt4-corelib actually build? Or did they all fail during build?

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

tcberner added a comment.Jun 2 2017, 7:15 PM
In D8322#228515, @mikael.urankar_gmail.com wrote:
In D8322#228514, @tcberner wrote:

@mikael.urankar_gmail.com did any of the qt4-* ports apart from qt4-corelib actually build? Or did they all fail during build?

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

Ok, then I probably should bump all these.

tcberner updated this revision to Diff 29157.Jun 2 2017, 7:27 PM

Bump revisions in the mentioned ports.

Harbormaster completed remote builds in B9636: Diff 29157.Jun 2 2017, 7:27 PM
mikael added a comment.Jun 4 2017, 12:33 PM

All the qt4 ports build fine on armv6, thanks.

tcberner added a comment.Jun 4 2017, 2:00 PM

OK, then if @rakuco and Co is fine with the bumps I will commit it tonight.

rakuco added a comment.Jun 4 2017, 8:03 PM
In D8322#228515, @mikael.urankar_gmail.com wrote:

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

What does "broken runtime" mean? Do they just crash when those instructions are reached instead of failing to build due to type mismatches?

mikael added a comment.Jun 4 2017, 8:13 PM
In D8322#228815, @rakuco wrote:
In D8322#228515, @mikael.urankar_gmail.com wrote:

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

What does "broken runtime" mean? Do they just crash when those instructions are reached instead of failing to build due to type mismatches?

They build fine but the binary (or library) contains invalid atomic ops (the linux one: ffff0fc0) and they crash. Here is an example of qdbusxml2cpp crashing (R15=ffff0fc0):
http://beefy8.nyi.freebsd.org/data/head-armv6-default/p441125_s318432/logs/errors/qtkeychain-qt4-0.7.0.log

There is no type mismatch.

rakuco accepted this revision.Jun 5 2017, 10:04 AM
In D8322#228824, @mikael.urankar_gmail.com wrote:

They build fine but the binary (or library) contains invalid atomic ops (the linux one: ffff0fc0) and they crash. Here is an example of qdbusxml2cpp crashing (R15=ffff0fc0):
http://beefy8.nyi.freebsd.org/data/head-armv6-default/p441125_s318432/logs/errors/qtkeychain-qt4-0.7.0.log

Thanks for the clarification. @tcberner, please go ahead.

Closed by commit rP442740: Fix qt4 ports on armv6. (authored by tcberner). · Explain WhyJun 6 2017, 5:01 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
devel/
qt4-corelib/
files/
39 lines

Diff 21611

View Options

devel/qt4-corelib/files/patch-fixup_arm6_arch

Loading...