Plume/Plume
9
18
Fork 24
Code Issues 180 Pull requests 8 Releases 8 Wiki Activity

Fix Plume arm builds #427

Merged
mcrosson merged 4 commits from llvm-multiarch-fixes into master 2019-01-18 19:57:20 +00:00
Conversation 1 Commits 4 Files changed 2 +42 -6
mcrosson commented 2019-01-12 05:41:11 +00:00 (Migrated from github.com)
Copy link

llvm latest svn commit is broken as of 2019/01/12. This patch pins the llvm+lld versions used for arm compiles.

It also tweaks the architecture detection to be more reliable in multi-lib/multi-arch situations where the CPU is 64bit but the runtime is 32bit.

llvm latest svn commit is broken as of 2019/01/12. This patch pins the llvm+lld versions used for arm compiles. It also tweaks the architecture detection to be more reliable in multi-lib/multi-arch situations where the CPU is 64bit but the runtime is 32bit.
codecov[bot] commented 2019-01-12 06:14:53 +00:00 (Migrated from github.com)
Copy link

Codecov Report

Merging #427 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master     #427   +/-   ##
=======================================
  Coverage   27.64%   27.64%           
=======================================
  Files          63       63           
  Lines        7336     7336           
=======================================
  Hits         2028     2028           
  Misses       5308     5308
# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/427?src=pr&el=h1) Report > Merging [#427](https://codecov.io/gh/Plume-org/Plume/pull/427?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/09a26b46025a085b31140e7f1d261b1da245a0e2?src=pr&el=desc) will **not change** coverage. > The diff coverage is `n/a`. ```diff @@ Coverage Diff @@ ## master #427 +/- ## ======================================= Coverage 27.64% 27.64% ======================================= Files 63 63 Lines 7336 7336 ======================================= Hits 2028 2028 Misses 5308 5308 ```
igalic (Migrated from github.com) reviewed 2019-01-12 06:38:35 +00:00
script/plume-front.sh
@ -4,0 +15,4 @@
print('amd64', end='')
elif processor == 'armv7l':
print('armhf', end='')
EOF
igalic (Migrated from github.com) commented 2019-01-12 06:37:47 +00:00
Copy link

how big is the chance that anyone's still using i386?

how big is the chance that anyone's still using i386?
mcrosson (Migrated from github.com) reviewed 2019-01-12 06:53:29 +00:00
script/plume-front.sh
@ -4,0 +15,4 @@
print('amd64', end='')
elif processor == 'armv7l':
print('armhf', end='')
EOF
mcrosson (Migrated from github.com) commented 2019-01-12 06:53:29 +00:00
Copy link

@igalic the main linux kernel dev's have suggested dropping i386 support...

If it's something others run into I'm happy to add it back but i need the platform.machine() output to add it to the conditional. I don't have access to i386 and didn't want to add an arch that I don't have valid output for.

@igalic the main linux kernel dev's have suggested dropping i386 support... If it's something others run into I'm happy to add it back but i need the platform.machine() output to add it to the conditional. I don't have access to i386 and didn't want to add an arch that I don't have valid output for.
elegaanz (Migrated from github.com) reviewed 2019-01-12 10:44:41 +00:00
script/plume-front.sh
@ -2,2 +2,3 @@
ARCH=`arch`
ARCH=$(python <<EOF
from __future__ import print_function
elegaanz (Migrated from github.com) commented 2019-01-12 10:44:41 +00:00
Copy link

Wouldn't it be possible to do the same with Bash? And maybe you could use Python 3 if it present instead of importing from __future__.

Wouldn't it be possible to do the same with Bash? And maybe you could use Python 3 if it present instead of importing from `__future__`.
igalic (Migrated from github.com) reviewed 2019-01-12 13:50:46 +00:00
script/plume-front.sh
@ -2,2 +2,3 @@
ARCH=`arch`
ARCH=$(python <<EOF
from __future__ import print_function
igalic (Migrated from github.com) commented 2019-01-12 13:50:46 +00:00
Copy link

Wouldn't it be possible to do the same with Bash?

yes. with great difficulty.

And maybe you could use Python

+1

> Wouldn't it be possible to do the same with Bash? yes. with great difficulty. > And maybe you could use Python +1
mcrosson (Migrated from github.com) reviewed 2019-01-12 18:24:12 +00:00
script/plume-front.sh
@ -2,2 +2,3 @@
ARCH=`arch`
ARCH=$(python <<EOF
from __future__ import print_function
mcrosson (Migrated from github.com) commented 2019-01-12 18:24:12 +00:00
Copy link

@BaptisteGelez I was trying to do this in bash initally and... it ended up being easier to read and maintain with python.

Re python 2/3 ; the code in question will run under both. Ubuntu and Debian still have python2 as a default and the slim docker images don't include both by default. I wanted to keep the code as generic as possible so additional dependencies won't be necessary if it's used elsewhere.

@BaptisteGelez I was trying to do this in bash initally and... it ended up being easier to read and maintain with python. Re python 2/3 ; the code in question will run under both. Ubuntu and Debian still have python2 as a default and the slim docker images don't include both by default. I wanted to keep the code as generic as possible so additional dependencies won't be necessary if it's used elsewhere.
elegaanz (Migrated from github.com) approved these changes 2019-01-18 19:55:05 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
elegaanz
Labels
Clear labels   
A: API

Related to the REST API

  
A: Backend

Code running on the server

  
A: Federation

Stuff related to Federation

  
A: Front-End

Related to the front-end

  
A: I18N

Translations, and related code

  
A: Meta

More about project management or code than the project itself

  
A: Security

   
Build

The building, or installation process of Plume

  
C: Bug

Something isn't working

  
C: Discussion

We need to talk

  
C: Enhancement

New feature or request

  
C: Feature

This is a new feature

  
Compatibility

Compatibility with different browsers, readers and OS

  
Dependency

Related to an external package that Plume uses

  
Design

UI/UX related issues and PRs

  
Documentation

   
Good first issue

Good for newcomers

  
Help welcome

Extra attention is needed

  
Mobile

Issues affecting only mobile UX

  
Rendering

How elements're rendered out for the end user

  
S: Blocked

Something else needs to be fixed first

  
S: Duplicate

This issue or pull request already exists

  
S: Incomplete

This PR is not complete yet

  
S: Instance specific

Issues concern a limited number of instances

  
S: Invalid

This doesn't seem right

  
S: Needs Voting/Discussion

Need to be discussed by the community (on Loomio)

  
S: Ready for review

This PR is ready to be reviewed

  
Suggestion

Proposed ideas worth considering

  
S: Voted on Loomio

This is issue has been created after a vote on Loomio

  
S: Wontfix

This will not be worked on

No labels
A: API
A: Backend
A: Federation
A: Front-End
A: I18N
A: Meta
A: Security
Build
C: Bug
C: Discussion
C: Enhancement
C: Feature
Compatibility
Dependency
Design
Documentation
Good first issue
Help welcome
Mobile
Rendering
S: Blocked
S: Duplicate
S: Incomplete
S: Instance specific
S: Invalid
S: Needs Voting/Discussion
S: Ready for review
Suggestion
S: Voted on Loomio
S: Wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: Plume/Plume#427
No description provided.
Delete branch "llvm-multiarch-fixes"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?