summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-04 16:50:16 -0700
committerMichael Forney <mforney@mforney.org>2016-07-04 20:26:49 -0700
commite08b96997360e4a4245c1142678d7e966d654d0f (patch)
treeea1772e63685c8a02fd811f9891801049c8b5ddf
parent8f2d73e425db3778a648401b2b406b22d2b80dac (diff)
python: Enable ssl and pyexpat
These are required for youtube-dl for some sites.
-rw-r--r--devel/python/Setup4
-rw-r--r--devel/python/gen.rc9
2 files changed, 9 insertions, 4 deletions
diff --git a/devel/python/Setup b/devel/python/Setup
index 3c4d9e54..3aac233d 100644
--- a/devel/python/Setup
+++ b/devel/python/Setup
@@ -43,7 +43,7 @@ select selectmodule.c
mmap mmapmodule.c
_csv _csv.c
_socket socketmodule.c
-#_ssl _ssl.c
+_ssl _ssl.c
_crypt _cryptmodule.c
#nis nismodule.c
termios termios.c
@@ -65,7 +65,7 @@ parser parsermodule.c
#fpectl fpectlmodule.c
#fpetest fpetestmodule.c
zlib zlibmodule.c
-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c
+pyexpat pyexpat.c
#_multibytecodec cjkcodecs/multibytecodec.c
#_codecs_cn cjkcodecs/_codecs_cn.c
#_codecs_hk cjkcodecs/_codecs_hk.c
diff --git a/devel/python/gen.rc b/devel/python/gen.rc
index aaa87408..bbe4bee3 100644
--- a/devel/python/gen.rc
+++ b/devel/python/gen.rc
@@ -132,10 +132,15 @@ if(grep -q '^_ctypes' Setup) {
deps=($deps phony/desktop/libffi/headers)
libs=($libs desktop/libffi/libffi.a)
}
-if(grep -q '^_hashlib' Setup) {
+if(grep -qE '^(_hashlib|_ssl)' Setup) {
cflags=($cflags -isystem '$builddir'/core/libressl/include)
deps=($deps phony/core/libressl/headers)
- libs=($libs core/libressl/libcrypto.a core/openbsd/libbsd.a)
+ libs=($libs core/libressl/^(libssl.a libcrypto.a) core/openbsd/libbsd.a)
+}
+if(grep -q '^pyexpat' Setup) {
+ cflags=($cflags -isystem '$builddir'/desktop/expat/include)
+ deps=($deps phony/desktop/expat/headers)
+ libs=($libs desktop/expat/libexpat.a)
}
if(grep -q '^zlib' Setup) {
cflags=($cflags -isystem '$builddir'/core/zlib/include)