Skip to content

Commit

Permalink
Recompile PyInstaller Linux bootloader with no-pie
Browse files Browse the repository at this point in the history
  • Loading branch information
crwood committed Dec 4, 2020
1 parent ee7b709 commit 330f0cc
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 21 deletions.
40 changes: 20 additions & 20 deletions Makefile
Expand Up @@ -167,35 +167,35 @@ install:

pyinstaller:
if [ ! -d dist/Tahoe-LAFS ] ; then make frozen-tahoe ; fi
python3 -m virtualenv --clear .tox/pyinstaller && \
source .tox/pyinstaller/bin/activate && \
pip install -r requirements/gridsync.txt && \
pip install -r requirements/pyinstaller.txt && \
pip install -e . && \
rm -rf build/pyinstaller ; \
git clone https://github.com/pyinstaller/pyinstaller.git build/pyinstaller && \
pushd build/pyinstaller && \
git checkout 0c3112a1d3e541c017dc860de825e12b2f5d13c0 && \
pushd bootloader && \
case `uname` in \
Darwin) \
python3 -m virtualenv --clear --python=python3.7 .tox/pyinstaller && \
source .tox/pyinstaller/bin/activate && \
pip install -r requirements/gridsync.txt && \
pip install -r requirements/pyinstaller.txt && \
pip install -e . && \
rm -rf build/pyinstaller ; \
git clone https://github.com/pyinstaller/pyinstaller.git build/pyinstaller && \
pushd build/pyinstaller && \
git checkout v4.1 && \
pushd bootloader && \
export MACOSX_DEPLOYMENT_TARGET=10.13 && \
export CFLAGS=-mmacosx-version-min=10.13 && \
export CPPFLAGS=-mmacosx-version-min=10.13 && \
export LDFLAGS=-mmacosx-version-min=10.13 && \
export LINKFLAGS=-mmacosx-version-min=10.13 && \
python ./waf all && \
popd && \
pip install . && \
popd && \
pip list && \
export PYTHONHASHSEED=1 && \
pyinstaller -y misc/gridsync.spec \
export LINKFLAGS=-mmacosx-version-min=10.13 \
;; \
*) \
python3 -m tox -e pyinstaller \
export CC="gcc -no-pie" \
;; \
esac
esac && \
python ./waf all && \
popd && \
pip install . && \
popd && \
pip list && \
export PYTHONHASHSEED=1 && \
pyinstaller -y misc/gridsync.spec

dmg:
python3 -m virtualenv --clear build/venv-dmg
Expand Down
1 change: 0 additions & 1 deletion tox.ini
Expand Up @@ -31,7 +31,6 @@ deps =
setenv =
PYTHONHASHSEED=1
commands =
pip install git+https://github.com/pyinstaller/pyinstaller@0c3112a1d3e541c017dc860de825e12b2f5d13c0
pip list
pyinstaller -y misc/gridsync.spec

Expand Down

0 comments on commit 330f0cc

Please sign in to comment.