On 21 Aug, Don Lewis wrote: > On 22 Aug, Matthias Seidel wrote: >> Am 21.08.20 um 23:55 schrieb Don Lewis: >>> On 21 Aug, GitBox wrote: >>>> Pilot-Pirx commented on pull request #92: >>>> URL: https://github.com/apache/openoffice/pull/92#issuecomment-678517434 >>>> >>>> >>>> Shouldn't that be 1.0.2t in /main/openssl/version.mk? >>>> (The same applies to trunks and AOO42X) >>> Probably if it's actually used anywhere. >> >> It was updated to 1.0.2h in the first step. >> When updating to 1.0.2p and then to 1.0.2t the file was somehow forgotten. >> >> I don't think that it is really used but just for conformity it should >> reflect the actual version. >> >> If there are no objections I would make the changes... > > I'm wondering if version.mk is even included anywhere. It gets > delivered, so that would need to be fixed as well if we delete it the > file.
If I remove main/openssl/version.mk and apply the following patch, I can build trunk on debian: diff --git a/main/openssl/prj/d.lst b/main/openssl/prj/d.lst index 72065853d7..6b67f0fefc 100644 --- a/main/openssl/prj/d.lst +++ b/main/openssl/prj/d.lst @@ -1,6 +1,5 @@ mkdir: %_DEST%\inc%_EXT%\external mkdir: %_DEST%\inc%_EXT%\external\openssl -..\version.mk %_DEST%\inc%_EXT%\external\openssl\version.mk ..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl ..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib ..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
