From f18ea813967c1b35a8977bd193c19857f61f7a8c Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Thu, 10 Aug 2017 00:18:12 +0200 Subject: python3: upgrade to release 3.5.4 Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944 Reviewed-on: https://gerrit.libreoffice.org/40944 Reviewed-by: Michael Stahl Tested-by: Jenkins (cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f) Reviewed-on: https://gerrit.libreoffice.org/41028 --- download.lst | 4 +- external/python3/UnpackedTarball_python3.mk | 4 +- external/python3/python-3.3.0-msvc-disable.patch.1 | 60 ---------------- external/python3/python-3.3.0-ssl.patch.1 | 78 -------------------- external/python3/python-3.5.4-msvc-disable.patch.1 | 61 ++++++++++++++++ external/python3/python-3.5.4-ssl.patch.1 | 83 ++++++++++++++++++++++ 6 files changed, 148 insertions(+), 142 deletions(-) delete mode 100644 external/python3/python-3.3.0-msvc-disable.patch.1 delete mode 100644 external/python3/python-3.3.0-ssl.patch.1 create mode 100644 external/python3/python-3.5.4-msvc-disable.patch.1 create mode 100644 external/python3/python-3.5.4-ssl.patch.1 diff --git a/download.lst b/download.lst index 2e22bd1101df..9faf3b465130 100644 --- a/download.lst +++ b/download.lst @@ -142,8 +142,8 @@ ifeq ($(PYTHON_VERSION_MINOR),3) export PYTHON_MD5SUM := 803a75927f8f241ca78633890c798021 export PYTHON_TARBALL := Python-3.3.5.tgz else -export PYTHON_MD5SUM := 6192f0e45f02575590760e68c621a488 -export PYTHON_TARBALL := Python-3.5.3.tgz +export PYTHON_MD5SUM := 2ed4802b7a2a7e40d2e797272bf388ec +export PYTHON_TARBALL := Python-3.5.4.tgz endif export RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz diff --git a/external/python3/UnpackedTarball_python3.mk b/external/python3/UnpackedTarball_python3.mk index f84b98299b8c..20192af318bf 100644 --- a/external/python3/UnpackedTarball_python3.mk +++ b/external/python3/UnpackedTarball_python3.mk @@ -19,8 +19,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ external/python3/i100492-freebsd.patch.1 \ $(if $(filter AIX,$(OS)),external/python3/python-3.3.3-aix.patch.1) \ external/python3/python-3.3.0-darwin.patch.1 \ - external/python3/python-3.3.0-ssl.patch.1 \ - external/python3/python-3.3.0-msvc-disable.patch.1 \ + external/python3/python-3.5.4-ssl.patch.1 \ + external/python3/python-3.5.4-msvc-disable.patch.1 \ external/python3/python-3.3.0-i42553.patch.2 \ external/python3/python-3.3.0-pythreadstate.patch.1 \ external/python3/python-3.3.0-clang.patch.1 \ diff --git a/external/python3/python-3.3.0-msvc-disable.patch.1 b/external/python3/python-3.3.0-msvc-disable.patch.1 deleted file mode 100644 index c571c5c4e878..000000000000 --- a/external/python3/python-3.3.0-msvc-disable.patch.1 +++ /dev/null @@ -1,60 +0,0 @@ -Disable some stuff LO does not need, especially stuff with external dependencies - -diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln ---- python3.orig/PCbuild/pcbuild.sln 2015-07-26 17:43:52.262528695 +0200 -+++ python3/PCbuild/pcbuild.sln 2015-07-26 18:00:18.438594901 +0200 -@@ -12,8 +12,6 @@ - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_decimal", "_decimal.vcxproj", "{0E9791DB-593A-465F-98BC-681011311617}" -@@ -28,32 +26,18 @@ - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcxproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcxproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testimportmultiple", "_testimportmultiple.vcxproj", "{36D0C52C-DF4E-45D0-8BC7-E294C3ABC781}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcxproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcxproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcxproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_lzma", "_lzma.vcxproj", "{F9D71780-F393-11E0-BE50-0800200C9A66}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdist_wininst\bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcxproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" -@@ -58,12 +58,6 @@ - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", "_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "tcl.vcxproj", "{B5FD6F1D-129E-4BFF-9340-03606FAC7283}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tix", "tix.vcxproj", "{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", "pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}" - EndProject - Global diff --git a/external/python3/python-3.3.0-ssl.patch.1 b/external/python3/python-3.3.0-ssl.patch.1 deleted file mode 100644 index c4bc117f5558..000000000000 --- a/external/python3/python-3.3.0-ssl.patch.1 +++ /dev/null @@ -1,78 +0,0 @@ --*- Mode: diff -*- - -Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc. - -diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln ---- python3.orig/PCbuild/pcbuild.sln 2015-08-22 18:57:16.653719900 +0200 -+++ python3/PCbuild/pcbuild.sln 2015-08-22 19:03:06.062853000 +0200 -@@ -64,10 +64,6 @@ - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}" - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay", "libeay.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay", "ssleay.vcxproj", "{10615B24-73BF-4EFA-93AA-236916321317}" --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", "pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}" - EndProject - Global -diff -ru python3.orig/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj ---- python3.orig/PCbuild/_ssl.vcxproj 2015-08-11 02:52:36.000000000 +0200 -+++ python3/PCbuild/_ssl.vcxproj 2015-08-22 18:19:20.744299000 +0200 -@@ -61,10 +61,10 @@ - - - -- $(opensslIncludeDir);%(AdditionalIncludeDirectories) -+ $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - - -- ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) -+ ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies) - - - -@@ -75,14 +75,6 @@ - {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} - false - -- -- {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} -- false -- -- -- {10615b24-73bf-4efa-93aa-236916321317} -- false -- - - {86937f53-c189-40ef-8ce8-8759d8e7d480} - false -diff -ru python3.orig/setup.py python3/setup.py ---- python3.orig/setup.py 2015-08-22 18:16:15.825267200 +0200 -+++ python3/setup.py 2015-08-22 18:22:44.162757900 +0200 -@@ -778,7 +778,10 @@ - exts.append( Extension('_socket', ['socketmodule.c'], - depends = ['socketmodule.h']) ) - # Detect SSL support for the socket module (via _ssl) -+ ooosslinc = os.environ.get('WORKDIR') + \ -+ '/UnpackedTarball/openssl/include/' - search_for_ssl_incs_in = [ -+ ooosslinc, - '/usr/local/ssl/include', - '/usr/contrib/ssl/include/' - ] -@@ -790,8 +793,12 @@ - ['/usr/kerberos/include']) - if krb5_h: - ssl_incs += krb5_h -+ ooossllib = os.environ.get('WORKDIR') + \ -+ '/UnpackedTarball/openssl' -+ ooosslinc = ooosslinc + '/' - ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, -- ['/usr/local/ssl/lib', -+ [ooossllib, -+ '/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' - ] ) - - diff --git a/external/python3/python-3.5.4-msvc-disable.patch.1 b/external/python3/python-3.5.4-msvc-disable.patch.1 new file mode 100644 index 000000000000..54b2a5f46540 --- /dev/null +++ b/external/python3/python-3.5.4-msvc-disable.patch.1 @@ -0,0 +1,61 @@ +Disable some stuff LO does not need, especially stuff with external dependencies + +diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln +--- python3.orig/PCbuild/pcbuild.sln 2017-08-10 00:04:44.359879894 +0200 ++++ python3/PCbuild/pcbuild.sln 2017-08-10 00:13:51.179873748 +0200 +@@ -12,8 +12,6 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythoncore", "pythoncore.vcxproj", "{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcxproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsound", "winsound.vcxproj", "{28B5D777-DDF2-4B6B-B34F-31D938813856}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_decimal", "_decimal.vcxproj", "{0E9791DB-593A-465F-98BC-681011311617}" +@@ -28,32 +26,18 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_socket", "_socket.vcxproj", "{86937F53-C189-40EF-8CE8-8759D8E7D480}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcxproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcxproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testcapi", "_testcapi.vcxproj", "{6901D91C-6E48-4BB7-9FEC-700C8131DF1D}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testimportmultiple", "_testimportmultiple.vcxproj", "{36D0C52C-DF4E-45D0-8BC7-E294C3ABC781}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcxproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcxproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcxproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_lzma", "_lzma.vcxproj", "{F9D71780-F393-11E0-BE50-0800200C9A66}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicodedata", "unicodedata.vcxproj", "{ECC7CEAC-A5E5-458E-BB9E-2413CC847881}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyexpat", "pyexpat.vcxproj", "{D06B6426-4762-44CC-8BAD-D79052507F2F}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "..\PC\bdist_wininst\bdist_wininst.vcxproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcxproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcxproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcxproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcxproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" +@@ -80,12 +64,6 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_testmultiphase", "_testmultiphase.vcxproj", "{16BFE6F0-22EF-40B5-B831-7E937119EF10}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcl", "tcl.vcxproj", "{B5FD6F1D-129E-4BFF-9340-03606FAC7283}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tix", "tix.vcxproj", "{C5A3E7FB-9695-4B2E-960B-1D9F43F1E555}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", "pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}" + EndProject + Global +Only in python3/PCbuild: pcbuild.sln~ diff --git a/external/python3/python-3.5.4-ssl.patch.1 b/external/python3/python-3.5.4-ssl.patch.1 new file mode 100644 index 000000000000..beb6fe38882f --- /dev/null +++ b/external/python3/python-3.5.4-ssl.patch.1 @@ -0,0 +1,83 @@ +-*- Mode: diff -*- + +Tweak SSL build to find OpenSSL in workdir & not build it itself in "ssl.vcproj" etc. + +diff -ru python3.orig/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln +--- python3.orig/PCbuild/pcbuild.sln 2017-08-09 23:39:15.511897077 +0200 ++++ python3/PCbuild/pcbuild.sln 2017-08-09 23:48:41.375890717 +0200 +@@ -86,10 +86,6 @@ + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tk", "tk.vcxproj", "{7E85ECCF-A72C-4DA4-9E52-884508E80BA1}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libeay", "libeay.vcxproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}" +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssleay", "ssleay.vcxproj", "{10615B24-73BF-4EFA-93AA-236916321317}" +-EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pyshellext", "pyshellext.vcxproj", "{0F6EE4A4-C75F-4578-B4B3-2D64F4B9B782}" + EndProject + Global +diff -ru python3.orig/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj +--- python3.orig/PCbuild/_ssl.vcxproj 2017-08-07 09:59:11.000000000 +0200 ++++ python3/PCbuild/_ssl.vcxproj 2017-08-09 23:50:36.871889419 +0200 +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -61,10 +61,10 @@ + + + +- $(opensslIncludeDir);%(AdditionalIncludeDirectories) ++ $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) + + +- ws2_32.lib;crypt32.lib;$(OutDir)libeay$(PyDebugExt).lib;$(OutDir)ssleay$(PyDebugExt).lib;%(AdditionalDependencies) ++ ws2_32.lib;crypt32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib;$(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib;%(AdditionalDependencies) + + + +@@ -78,14 +78,6 @@ + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} + false + +- +- {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} +- false +- +- +- {10615b24-73bf-4efa-93aa-236916321317} +- false +- + + {86937f53-c189-40ef-8ce8-8759d8e7d480} + false +diff -ru python3.orig/setup.py python3/setup.py +--- python3.orig/setup.py 2017-08-09 23:39:15.495897077 +0200 ++++ python3/setup.py 2017-08-09 23:53:06.891887733 +0200 +@@ -807,7 +807,10 @@ + exts.append( Extension('_socket', ['socketmodule.c'], + depends = ['socketmodule.h']) ) + # Detect SSL support for the socket module (via _ssl) ++ ooosslinc = os.environ.get('WORKDIR') + \ ++ '/UnpackedTarball/openssl/include/' + search_for_ssl_incs_in = [ ++ ooosslinc, + '/usr/local/ssl/include', + '/usr/contrib/ssl/include/' + ] +@@ -819,8 +822,12 @@ + ['/usr/kerberos/include']) + if krb5_h: + ssl_incs += krb5_h ++ ooossllib = os.environ.get('WORKDIR') + \ ++ '/UnpackedTarball/openssl' ++ ooosslinc = ooosslinc + '/' + ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, +- ['/usr/local/ssl/lib', ++ [ooossllib, ++ '/usr/local/ssl/lib', + '/usr/contrib/ssl/lib/' + ] ) + -- cgit v1.2.3