diff options
| author | Vlad Glagolev | 2020-04-20 17:58:38 +0000 |
|---|---|---|
| committer | Vlad Glagolev | 2020-04-20 18:01:42 +0000 |
| commit | 9b1ee67e7a592cb506022eb67e4b6e1ef9f44354 (patch) | |
| tree | f320eb6aec0041bcb908200c40b4355ecd0a8cfe | |
| parent | af663bc7bf145d7c524b27f9ee90eb7fc5c3df2d (diff) | |
Revert "python - fix install"
This reverts commit 9e344e03b790bd34ae59134617d5c29539e62917.
Reason: staging was enabled again in a later commit.
Conflicts:
devel/python/HISTORY
(cherry picked from commit 83ee2673252f4e268fe02e7f98c5261f0ecba5de)
| -rwxr-xr-x | devel/python/BUILD | 12 | ||||
| -rw-r--r-- | devel/python/HISTORY | 4 | ||||
| -rwxr-xr-x | devel/python/INSTALL | 7 |
3 files changed, 12 insertions, 11 deletions
diff --git a/devel/python/BUILD b/devel/python/BUILD index a156a3a337..ab8bcd50f2 100755 --- a/devel/python/BUILD +++ b/devel/python/BUILD @@ -9,4 +9,14 @@ if [[ -f $INSTALL_ROOT/usr/lib/python$PYTHON_VERSION/pydcop.py ]]; then "$SOURCE_DIRECTORY/spell-tmp" fi && -default_build +default_build && + +# python -c 'print "(c)", "lynx"*3' +# can only have one primary python, the others must be alt +if [[ $PY2K == y ]]; then + make install DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT" +else + make altinstall DESTDIR="$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT" +fi && + +message "${MESSAGE_COLOR}Fake stage complete, installing to real path...${DEFAULT_COLOR}" diff --git a/devel/python/HISTORY b/devel/python/HISTORY index 9162efdef1..b1d0ee0541 100644 --- a/devel/python/HISTORY +++ b/devel/python/HISTORY @@ -7,10 +7,6 @@ 2018-10-05 Pavel Vinogradov <public@sourcemage.org> * DETAILS: enabled staging (actually helps in tracking symlinks) -2018-09-27 Treeve Jelbert <treeve@sourcemage.org> - * BUILD INSTALL: remove fake install - not needed if staging is disabled, also fixes segfault during install - 2018-04-30 Pavel Vinogradov <public@sourcemage.org> * DETAILS: version 2.7.15, SECURITY_PATCH++, (CVE-2018-1060, CVE-2018-1061, CVE-2017-9233, CVE-2016-9063, diff --git a/devel/python/INSTALL b/devel/python/INSTALL index d5b4166a42..71abc31b5e 100755 --- a/devel/python/INSTALL +++ b/devel/python/INSTALL @@ -1,9 +1,4 @@ -# can only have one primary python, the others must be alt -if [[ $PY2K == y ]]; then - make install DESTDIR="$INSTALL_ROOT" -else - make altinstall DESTDIR="$INSTALL_ROOT" -fi && +cp -av "$SOURCE_DIRECTORY/anywhere/$INSTALL_ROOT/usr" "$INSTALL_ROOT/" && if [[ -f "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" ]]; then cp "$SOURCE_DIRECTORY/spell-tmp/pydcop.py" "$PYPATH" |