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
2 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
script/plume-front.sh
View file

@ -1,8 +1,24 @@
#!/bin/bash
ARCH=`arch`
ARCH=$(python <<EOF
from __future__ import print_function
elegaanz commented 2019-01-12 10:44:41 +00:00 (Migrated from github.com)
Review
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 commented 2019-01-12 13:50:46 +00:00 (Migrated from github.com)
Review
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 commented 2019-01-12 18:24:12 +00:00 (Migrated from github.com)
Review
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.
import platform
processor = platform.machine()
architecture = platform.architecture()
if processor == 'aarch64':
# Mutli arch arm support is why this 32bit check is present
if '32bit' in architecture:
print('armv71', end='')
else:
print('aarch64', end='')
elif processor == 'x86 64' or processor == 'x86_64':
print('amd64', end='')
elif processor == 'armv7l':
print('armhf', end='')
EOF
igalic commented 2019-01-12 06:37:47 +00:00 (Migrated from github.com)
Review
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 commented 2019-01-12 06:53:29 +00:00 (Migrated from github.com)
Review
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.
)
if [ "$ARCH" == "aarch64" -o "$ARCH" == "armv7l" ] ; then
if [ $ARCH == "aarch64" -o $ARCH == "armv71" ] ; then
export PATH=/opt/local/llvm/bin:${PATH}
cd /app
RUSTFLAGS="-C linker=lld" cargo web deploy -p plume-front

28
script/wasm-deps.sh
View file

@ -1,14 +1,34 @@
#!/bin/bash
ARCH=`arch`
ARCH=$(python <<EOF
from __future__ import print_function
import platform
processor = platform.machine()
architecture = platform.architecture()
if processor == 'aarch64':
# Mutli arch arm support is why this 32bit check is present
if '32bit' in architecture:
print('armv71', end='')
else:
print('aarch64', end='')
elif processor == 'x86 64' or processor == 'x86_64':
print('amd64', end='')
elif processor == 'armv7l':
print('armhf', end='')
EOF
)
if [ "$ARCH" == "aarch64" -o "$ARCH" == "armv7l" ] ; then
echo "Detected arch: $ARCH"
if [ $ARCH == "aarch64" -o $ARCH == "armv71" ] ; then
apt-get install -y --no-install-recommends build-essential subversion ninja-build cmake
mkdir -p /scratch/src
cd /scratch/src
svn co http://llvm.org/svn/llvm-project/llvm/trunk llvm
# Pin LLVM to post 7.0.1 tag and pin to a known-good revision for Plume builds
svn co -r350977 http://llvm.org/svn/llvm-project/llvm/trunk/ llvm
cd /scratch/src/llvm/tools
svn co http://llvm.org/svn/llvm-project/lld/trunk lld
# Pin lld to post 7.0.1 tag and pin to a known-good revision for Plume builds
svn co -r350975 http://llvm.org/svn/llvm-project/lld/trunk lld
#svn co http://llvm.org/svn/llvm-project/cfe/trunk clang
#svn co http://llvm.org/svn/llvm-project/clang-tools-extra/trunk extra
mkdir -p /scratch/build/arm