-*- Mode: diff -*- Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc. diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist --- python3.old_/Modules/Setup.dist 2012-09-29 10:00:42.000000000 +0200 +++ python3/Modules/Setup.dist 2012-11-13 14:19:01.994158111 +0100 @@ -236,14 +236,14 @@ # The _md5 module implements the RSA Data Security, Inc. MD5 # Message-Digest Algorithm, described in RFC 1321. -#_md5 md5module.c +_md5 md5module.c # The _sha module implements the SHA checksum algorithms. # (NIST's Secure Hash Algorithms.) -#_sha1 sha1module.c -#_sha256 sha256module.c -#_sha512 sha512module.c +_sha1 sha1module.c +_sha256 sha256module.c +_sha512 sha512module.c # The _tkinter module. diff -ru python3.old_/PC/VS9.0/pcbuild.sln python3/PC/VS9.0/pcbuild.sln --- python3.old_/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.000000000 +0200 +++ python3/PC/VS9.0/pcbuild.sln 2012-11-13 14:44:29.329147866 +0100 @@ -136,11 +136,6 @@ {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}" - ProjectSection(ProjectDependencies) = postProject - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj --- python3.old_/PC/VS9.0/_ssl.vcproj 2012-09-29 10:00:47.000000000 +0200 +++ python3/PC/VS9.0/_ssl.vcproj 2012-11-13 14:27:15.874169273 +0100 @@ -42,7 +42,7 @@ /> - $(opensslDir)\inc32;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) @@ -166,26 +166,26 @@ X64 - $(opensslDir)\inc64;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) - $(opensslDir)\inc32;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) @@ -193,26 +193,26 @@ X64 - $(opensslDir)\inc64;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) - $(opensslDir)\inc32;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) @@ -220,27 +220,27 @@ X64 - $(opensslDir)\inc64;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) MachineX64 - $(opensslDir)\inc32;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out32\libeay32.lib;$(opensslDir)\out32\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) @@ -248,14 +248,14 @@ X64 - $(opensslDir)\inc64;%(AdditionalIncludeDirectories) + $(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories) - ws2_32.lib;$(opensslDir)\out64\libeay32.lib;$(opensslDir)\out64\ssleay32.lib;%(AdditionalDependencies) + ws2_32.lib;$(SOLARVER)\$(INPATH)\lib\libeay32.lib;$(SOLARVER)\$(INPATH)\lib\ssleay32.lib;%(AdditionalDependencies) MachineX64 @@ -271,10 +271,6 @@ {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} false - - {e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0} - false - {86937f53-c189-40ef-8ce8-8759d8e7d480} false diff -ru python3.old_/setup.py python3/setup.py --- python3.old_/setup.py 2012-09-29 10:00:50.000000000 +0200 +++ python3/setup.py 2012-11-13 14:18:23.484158149 +0100 @@ -757,7 +757,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/' ] @@ -769,8 +774,13 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h + ooossllib = os.environ.get('SOLARVER') + '/' + \ + os.environ.get('INPATH') + '/' + \ + 'lib' + 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/' ] ) n> feature/go2 feature/gpg4libre feature/gpg4libre-5-4 feature/gpg4libre-6-0 feature/gpg4libre2 feature/graphicobject feature/gsoc-basic-ide-completion-and-other-bits feature/gsoc-calc-enhanced-db-range feature/gsoc-svm-writer feature/gsoc-uitest-2019 feature/gsoc14-colors feature/gsoc14-draw-chained-text-boxes feature/gsoc14-draw-text-background-color feature/gsoc14-libcmis feature/gsoc14-libcmis2 feature/gsoc14-personas feature/gsoc14-personas2 feature/gsoc15-online-update feature/gsoc15-open-remote-files-dialog feature/gsoc17-revamp-customize-dialog feature/gsoc19-chart-style feature/gsoc2011_wizards feature/gsoc24-lua feature/gtk3_kde5 feature/gtk3nativedialogs feature/gtktiledviewer feature/ia2 feature/ia2.2 feature/ia2.3 feature/ia2.4 feature/ia2.5 feature/improvexlsximport feature/instdirlinktargets feature/item_refactor2 feature/jsdialogs feature/jssidebar feature/lfrb-vcl-opengl feature/libffi feature/lok-calc-rtl feature/lok-clipboard feature/lok_cellcursor feature/lok_dialog feature/lok_dialog-backport feature/lok_dialog2 feature/lok_sofficemain feature/lok_sofficemain2 feature/mac-opengl-fixes feature/macOS-weld feature/mailmerge-toolbar feature/mar-updater feature/mariadb feature/misc-vba-rework feature/mork feature/nativealpha feature/notebookbar feature/notes-refactoring feature/ooxml-analyze feature/opengl-canvas-rework feature/opengl-transitions-rework feature/opengl-vcl-text feature/orcus-continuous-integration feature/orcus-odf feature/orcus-odf-rebased feature/orcus-odf-rebased2 feature/orcus-rebased feature/owncloud-provider-for-android feature/pdfium-master feature/perfwork4 feature/perfwork5 feature/pivotcharts feature/print_revamp feature/priorities feature/profilesafemode feature/propose-master-cib feature/pytable feature/pyweb-wizard feature/qt5-win+mac feature/refactor-god-objects feature/rendercontext feature/resolve-comments feature/scaling-geometry-provider feature/screenshotannotation feature/sgexperiment feature/skia feature/slidehack feature/slidehack2 feature/slideshow_onlySprites feature/slideshowprimitives feature/sparklines feature/spellig_popup_SID feature/stub_writer feature/svg-export feature/svg-optimisations feature/svg-optimisations-5-0 feature/sw-delete-undo-rework feature/sw_redlinehide_4a_for_libreoffice-6-2 feature/sw_redlinehide_4b_for_libreoffice-6-2 feature/table-style feature/table-style-rebased feature/table_panel feature/table_rotated_text feature/taggedPDF feature/template_manager_improvements feature/template_manager_improvements2 feature/themesupport feature/themesupport2 feature/tiled-editing feature/tscp3 feature/unitver feature/unocrsrptr feature/unostyles feature/unostyles2 feature/unostyles3 feature/use-ogl-context-in-canvas feature/vcl-opengl feature/vcl-opengl-integration feature/vcl-opengl2 feature/vclptr feature/vlc feature/vlc-rb feature/vs2012 feature/wasm feature/window-iter feature/windows-cross-build feature/windowsupdater feature/xtiledrenderable libreoffice-24-2 libreoffice-24-2-0 libreoffice-24-2-1 libreoffice-24-2-2 libreoffice-24-2-3 libreoffice-24-2-4 libreoffice-24-2-5 libreoffice-24-8 libreoffice-3-5 libreoffice-3-5-0 libreoffice-3-5-1 libreoffice-3-5-2 libreoffice-3-5-3 libreoffice-3-5-4 libreoffice-3-5-5 libreoffice-3-5-6 libreoffice-3-5-7 libreoffice-3-6 libreoffice-3-6-0 libreoffice-3-6-1 libreoffice-3-6-2 libreoffice-3-6-3 libreoffice-3-6-4 libreoffice-3-6-5 libreoffice-3-6-6 libreoffice-3-6-7 libreoffice-4-0 libreoffice-4-0-0 libreoffice-4-0-1 libreoffice-4-0-2 libreoffice-4-0-3 libreoffice-4-0-4 libreoffice-4-0-5 libreoffice-4-0-6 libreoffice-4-1 libreoffice-4-1-0 libreoffice-4-1-1 libreoffice-4-1-2 libreoffice-4-1-3 libreoffice-4-1-4 libreoffice-4-1-5 libreoffice-4-1-6 libreoffice-4-2 libreoffice-4-2-0 libreoffice-4-2-1 libreoffice-4-2-2 libreoffice-4-2-3 libreoffice-4-2-4 libreoffice-4-2-5 libreoffice-4-2-6 libreoffice-4-2-7 libreoffice-4-2-8 libreoffice-4-3 libreoffice-4-3-0 libreoffice-4-3-1 libreoffice-4-3-2 libreoffice-4-3-3 libreoffice-4-3-4 libreoffice-4-3-5 libreoffice-4-3-6 libreoffice-4-3-7 libreoffice-4-4 libreoffice-4-4-0 libreoffice-4-4-1 libreoffice-4-4-2 libreoffice-4-4-3 libreoffice-4-4-4 libreoffice-4-4-5 libreoffice-4-4-6 libreoffice-4-4-7 libreoffice-5-0 libreoffice-5-0-0 libreoffice-5-0-1 libreoffice-5-0-2 libreoffice-5-0-3 libreoffice-5-0-4 libreoffice-5-0-5 libreoffice-5-0-6 libreoffice-5-1 libreoffice-5-1-0 libreoffice-5-1-1 libreoffice-5-1-2 libreoffice-5-1-3 libreoffice-5-1-4 libreoffice-5-1-5 libreoffice-5-1-6 libreoffice-5-2 libreoffice-5-2-0 libreoffice-5-2-1 libreoffice-5-2-2 libreoffice-5-2-3 libreoffice-5-2-4 libreoffice-5-2-5 libreoffice-5-2-6 libreoffice-5-2-7 libreoffice-5-3 libreoffice-5-3-0 libreoffice-5-3-1 libreoffice-5-3-2 libreoffice-5-3-3 libreoffice-5-3-4 libreoffice-5-3-5 libreoffice-5-3-6 libreoffice-5-3-7 libreoffice-5-4 libreoffice-5-4-0 libreoffice-5-4-1 libreoffice-5-4-2 libreoffice-5-4-3 libreoffice-5-4-4 libreoffice-5-4-5 libreoffice-5-4-6 libreoffice-5-4-7 libreoffice-6-0 libreoffice-6-0-0 libreoffice-6-0-1 libreoffice-6-0-2 libreoffice-6-0-3 libreoffice-6-0-4 libreoffice-6-0-5 libreoffice-6-0-6 libreoffice-6-0-7 libreoffice-6-1 libreoffice-6-1-0 libreoffice-6-1-1 libreoffice-6-1-2 libreoffice-6-1-3 libreoffice-6-1-4 libreoffice-6-1-5 libreoffice-6-1-6 libreoffice-6-2 libreoffice-6-2-0 libreoffice-6-2-1 libreoffice-6-2-2 libreoffice-6-2-3 libreoffice-6-2-4 libreoffice-6-2-5 libreoffice-6-2-6 libreoffice-6-2-7 libreoffice-6-2-8 libreoffice-6-3 libreoffice-6-3-0 libreoffice-6-3-1 libreoffice-6-3-2 libreoffice-6-3-3 libreoffice-6-3-4 libreoffice-6-3-5 libreoffice-6-3-6 libreoffice-6-4 libreoffice-6-4-0 libreoffice-6-4-1 libreoffice-6-4-2 libreoffice-6-4-3 libreoffice-6-4-4 libreoffice-6-4-5 libreoffice-6-4-6 libreoffice-6-4-7 libreoffice-7-0 libreoffice-7-0-0 libreoffice-7-0-1 libreoffice-7-0-2 libreoffice-7-0-3 libreoffice-7-0-4 libreoffice-7-0-5 libreoffice-7-0-6 libreoffice-7-1 libreoffice-7-1-0 libreoffice-7-1-1 libreoffice-7-1-2 libreoffice-7-1-3 libreoffice-7-1-4 libreoffice-7-1-5 libreoffice-7-1-6 libreoffice-7-1-7 libreoffice-7-2 libreoffice-7-2-0 libreoffice-7-2-1 libreoffice-7-2-2 libreoffice-7-2-3 libreoffice-7-2-5 libreoffice-7-2-6 libreoffice-7-2-7 libreoffice-7-3 libreoffice-7-3-0 libreoffice-7-3-1 libreoffice-7-3-2 libreoffice-7-3-3 libreoffice-7-3-4 libreoffice-7-3-5 libreoffice-7-3-6 libreoffice-7-3-7 libreoffice-7-4 libreoffice-7-4-0 libreoffice-7-4-1 libreoffice-7-4-2 libreoffice-7-4-3 libreoffice-7-4-4 libreoffice-7-4-6 libreoffice-7-4-7 libreoffice-7-5 libreoffice-7-5-0 libreoffice-7-5-1 libreoffice-7-5-2 libreoffice-7-5-3 libreoffice-7-5-4 libreoffice-7-5-5 libreoffice-7-5-6 libreoffice-7-5-7 libreoffice-7-5-8 libreoffice-7-5-9 libreoffice-7-6 libreoffice-7-6-0 libreoffice-7-6-1 libreoffice-7-6-2 libreoffice-7-6-3 libreoffice-7-6-4 libreoffice-7-6-5 libreoffice-7-6-6 libreoffice-7-6-7 master ports/macosx10.5/master private/Ashod/cd-5.3-3.2_import_unloaded private/Ashod/cd-5.3-3.2_import_unloaded_share_GfxLink private/Ashod/cd-5.3.3.2 private/Ashod/cp-5.0-preinit private/Ashod/fast-calc-rendering private/Ashod/pdfium private/Ashod/pdfium_on_master private/Ashod/pdfium_on_master_fixed private/EL-SHREIF/ui_logger private/Rosemary/change-tracking private/Sweetshark/killswclient private/Sweetshark/lessdepend private/Sweetshark/multilistenerfix private/ajrhunt/c4 private/ajrhunt/cunit private/ajrhunt/cunitdemo private/ajrhunt/firebird-improvement private/bansan/chardraw private/bubli/textboxchaining private/hcvcastro/preinit private/hcvcastro/undo-row-comment private/jmux/armin-strip-before-squash private/jmux/broken-static-win private/jmux/current-reorga private/jmux/meson private/jmux/meson-gsoc-2021 private/jmux/oss-fuzz private/jmux/oss-fuzz-wip private/jmux/scheduler-fixes private/jmux/shape.odt private/jmux/wasm-for-master private/jmux/wasm-tmp private/jmux/wasm_for_master_catchall private/jmux/win-arm64 private/jmux/win-test-nohang private/juergen/Tests private/kendy/condformat-api private/kendy/condformat-fdo82014 private/kendy/mailmerge-04 private/kendy/mailmerge-05 private/kendy/swinterpreter private/kendy/testcl private/khaledhosny/color-fonts private/khaledhosny/vcl-cleanup-font private/kohei/chart-bugs private/kohei/find-replace-all-perf private/kohei/headless-perf private/kohei/if-or-not-if-jump private/kohei/sort-ref-update private/lfrb/opengl-vcl private/lgodard/calc_notes_import_export private/lgodard/tdf#117202 private/llunak/mailmerge private/llunak/mailmerge_01 private/llunak/mailmerge_02 private/llunak/mailmerge_03 private/llunak/munich_12587 private/llunak/skia private/lmamane/basetest private/lmamane/for-julien2412 private/lmamane/for-julien2412-master private/lmamane/tdf110997 private/lmamane/timedate-controls-nanosecond private/lmamane/validation private/mcecchetti/23H1/a11y/paragraph private/mcecchetti/accessibility/paragraph private/mcecchetti/amd/pdf-export-jpeg private/mcecchetti/bitmapcrc64 private/mcecchetti/bitmapcrc64-5-0 private/mcecchetti/calc-perf-unit-test private/mcecchetti/calc-unit-test private/mcecchetti/gl-program-binary private/mert/wip_deepl private/mikekaganski/multicolumn private/mmeeks/aafixes44 private/mmeeks/backports private/mmeeks/binarydatacache private/mmeeks/bitmapcrc64 private/mmeeks/copy-paste private/mmeeks/copypaste private/mmeeks/cp-6.2-bits private/mmeeks/cp64merge private/mmeeks/currency-dropdown private/mmeeks/foo private/mmeeks/formula-iterator private/mmeeks/gldebug private/mmeeks/hidpi-bits private/mmeeks/icontest private/mmeeks/opengl-backbuffer private/mmeeks/opengl-backbuffer2 private/mmeeks/sandbox private/mmeeks/swapdatacontainer private/mmeeks/vcl-opengl3 private/moggi/fix-opengl-context-problems private/moggi/improved-dxf-xls-export private/moggi/opengl-4-4-build-test private/moggi/opengl-preparation private/moggi/opengl-vcl-win private/moggi/orcus-improvements private/moggi/track-win-dc private/moggi/ui-test private/moggi/vcl-opengl3 private/mst/sw_fieldmarkhide private/mst/sw_redlinehide private/mst/sw_redlinehide_2 private/mst/sw_redlinehide_3 private/mst/sw_redlinehide_4a private/mst/sw_redlinehide_4b private/pranavk/modernize_gtktiledviewer private/quwex/gsoc-box2d-experimental private/quwex/notespane-search private/quwex/notespaneflat private/quwex/notespanesquashed private/quwex/tdf59323 private/s.mehrbrodt/colorpicker-backport private/sweetshark/swdepend private/tbsdy/clipping private/tbsdy/drawserverfontlayout private/tbsdy/emf private/tbsdy/osl_getAllEnvironment private/tbsdy/outdev private/tbsdy/printinfomgr private/tbsdy/workbench private/thb/libo-6-1+backports private/thb/libreoffice-5-2+backports private/thb/sw_redlinehide-6-1 private/thb/tdf149754 private/thb/wasm-upstreaming private/timar/cp-6.2-centos7 private/timar/fontconfigcrash private/timar/pythonupgrademsp private/tml/Use-the-iOS-French-and-Italian-dictionaries-for-othe private/tml/android-use-bionic-linker-copy private/tml/android-use-faulty.lib private/tml/cp-6-4-28-1 private/tml/fixwintext private/tml/iculess private/tml/lov-6.1.5.2 private/tml/lov-6.2.1 private/tml/lov-7.0.3.3 private/tml/lov-7.0.4 private/tml/lov-7.1.2 private/tml/opencl-default-1 private/tvajngerl/staging ref/for/distro/collabora/cp-6.2 LibreOffice 核心代码仓库文档基金会 summaryrefslogtreecommitdiff log msg author committer range path: root/extras/CustomTarget_glade.mkAgeCommit message (Expand)Author