Skip to content

Commit

Permalink
#1883 use paramiko, comtypes, netifaces and rencode from upstream pac…
Browse files Browse the repository at this point in the history
…kages

git-svn-id: https://xpra.org/svn/Xpra/trunk@21147 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Nov 29, 2018
1 parent b44dd36 commit 5d45a1e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/win32/MINGW_SETUP.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ $PACMAN --noconfirm -S ${XPKG}gst-python
#development tools and libs for building extra packages:
$PACMAN --noconfirm -S base-devel ${XPKG}yasm ${XPKG}nasm subversion rsync zip gtk-doc ${XPKG}cmake ${XPKG}gcc ${XPKG}pkg-config ${XPKG}libffi ${XPKG}gss ${XPKG}openldap
#python libraries and packaging tools:
for x in cryptography cffi pycparser numpy pillow cx_Freeze appdirs; do
for x in cryptography cffi pycparser numpy pillow cx_Freeze appdirs paramiko comtypes netifaces rencode; do
$PACMAN --noconfirm -S ${XPKG}python2-${x}
$PACMAN --noconfirm -S ${XPKG}python3-${x}
done
Expand All @@ -48,7 +48,7 @@ $PACMAN --noconfirm -S ${XPKG}cython
#build pynacl against the system library:
export SODIUM_INSTALL=system
easy_install-2.7 -U -Z enum34 enum-compat
for x in rencode lz4 websocket-client netifaces comtypes websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl paramiko; do
for x in lz4 websocket-client websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl; do
easy_install-2.7 -U -Z $x
easy_install-3.7 -U -Z $x
done
Expand Down
2 changes: 1 addition & 1 deletion src/win32/UPDATE_PYTHON_LIBS.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#using easy-install for python libraries which are not packaged by mingw:
# currently disabled, build from patched source only: websockify
export SODIUM_INSTALL=system
for x in rencode lz4 websocket-client netifaces comtypes websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl paramiko; do
for x in lz4 websocket-client netifaces comtypes websockify nvidia-ml-py setproctitle pyu2f python-ldap ldap3 bcrypt pynacl; do
easy_install-2.7 -U -Z $x
easy_install-3.7 -U -Z $x
done
Expand Down

0 comments on commit 5d45a1e

Please sign in to comment.