On 3 Oct, Don Lewis wrote: > On 4 Oct, Matthias Seidel wrote: >> Hi Don, >> >> As requested: >> >> ---8<--- >> >> build -- version: - >> >> WARNING(S): >> >> ATTENTION: If you are performing an incompatible build, please break the >> build with Ctrl+C and prepare the workspace with "--prepare" switch! >> >> >> ============= >> Building module shell >> ============= >> >> Entering /cygdrive/c/Source/openoffice/main/shell/inc >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/backends/localebe >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/win32 >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/all >> >> >> Entering >> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/infotips >> >> >> Entering >> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/util >> >> >> Entering >> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/propsheets >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/tools/regsvrex >> >> Making: all_regsvrex.dpobj >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/win32/sysmail >> >> Making: all_sysmail.dpslo >> Making: all_sysmail.dpobj >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/tools/lngconvex >> >> >> Entering >> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/res >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/all/zipfile >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/source/all/ooofilereader >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/qa/zip/testimpl >> >> >> Entering /cygdrive/c/Source/openoffice/main/shell/qa/zip >> >> Compiling: shell/qa/zip/ziptest.cxx >> Making: qa_zip.exe >> Microsoft (R) Incremental Linker Version 9.00.30729.01 >> Copyright (C) Microsoft Corporation. All rights reserved. >> >> /MAP /OPT:NOREF -safeseh -nxcompat -dynamicbase -NODEFAULTLIB -RELEASE >> -DEBUG -INCREMENTAL:NO /SUBSYSTEM:CONSOLE /BASE:0x1b000000 >> -out:../../wntmsci12.pro/bin/qa_zip.exe >> -map:../../wntmsci12.pro/misc/qa_zip.map >> ../../wntmsci12.pro/slo/ziptest.obj >> ../../wntmsci12.pro/slb/../lib/iqa_zipimpl.lib isal.lib igtest.lib >> msvcrt.lib msvcprt.lib uwinapi.lib kernel32.lib user32.lib oldnames.lib >> linking ../../wntmsci12.pro/bin/qa_zip.exe.manifest ... >> [==========] Running 3 tests from 1 test case. >> [----------] Global test environment set-up. >> [----------] 3 tests from Test >> [ RUN ] Test.test_directory >> [ OK ] Test.test_directory (15 ms) >> [ RUN ] Test.test_hasContentCaseInSensitive >> [ OK ] Test.test_hasContentCaseInSensitive (0 ms) >> [ RUN ] Test.test_getContent >> [ OK ] Test.test_getContent (0 ms) >> [----------] 3 tests from Test (15 ms total) >> >> [----------] Global test environment tear-down >> [==========] 3 tests from 1 test case ran. (15 ms total) >> [ PASSED ] 3 tests. >> >> Entering >> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/ooofilt >> >> mkdir.exe ../../../../wntmsci12.pro/bin/x64 >> mkdir.exe ../../../../wntmsci12.pro/misc/x64 >> mkdir.exe ../../../../wntmsci12.pro/lib/x64 >> mkdir.exe ../../../../wntmsci12.pro/slb/x64 >> Making: ../../../../wntmsci12.pro/bin/x64/ooofilt.dll >> Microsoft (R) Windows (R) Resource Compiler Version 6.1.7600.16385 >> Copyright (C) Microsoft Corporation. All rights reserved. >> >> C:/PROGRA~2/MICROS~1.0/VC/bin/amd64/link.exe -nologo -MACHINE:X64 >> @C:/cygwin64/tmp/mkYnBHBc >> Creating library ../../../../wntmsci12.pro/lib/x64/iooofilt_t1.lib >> and object ../../../../wntmsci12.pro/lib/x64/iooofilt_t1.exp >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_ParserCreate referenced in function "public: __cdecl >> xml_parser::xml_parser(unsigned short const *)" >> (??0xml_parser@@QEAA@PEBG@Z) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_ParserFree referenced in function "public: __cdecl >> xml_parser::~xml_parser(void)" (??1xml_parser@@QEAA@XZ) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_SetCommentHandler referenced in function "private: void >> __cdecl xml_parser::init(void)" (?init@xml_parser@@AEAAXXZ) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_SetCharacterDataHandler referenced in function >> "private: void __cdecl xml_parser::init(void)" (?init@xml_parser@@AEAAXXZ) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_SetElementHandler referenced in function "private: void >> __cdecl xml_parser::init(void)" (?init@xml_parser@@AEAAXXZ) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_UseParserAsHandlerArg referenced in function "private: >> void __cdecl xml_parser::init(void)" (?init@xml_parser@@AEAAXXZ) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_SetUserData referenced in function "private: void >> __cdecl xml_parser::init(void)" (?init@xml_parser@@AEAAXXZ) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_GetCurrentLineNumber referenced in function "public: >> void __cdecl xml_parser::parse(char const *,unsigned __int64,bool)" >> (?parse@xml_parser@@QEAAXPEBD_K_N@Z) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_GetCurrentColumnNumber referenced in function "public: >> void __cdecl xml_parser::parse(char const *,unsigned __int64,bool)" >> (?parse@xml_parser@@QEAAXPEBD_K_N@Z) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_GetCurrentByteIndex referenced in function "public: >> void __cdecl xml_parser::parse(char const *,unsigned __int64,bool)" >> (?parse@xml_parser@@QEAAXPEBD_K_N@Z) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_ErrorString referenced in function "public: void >> __cdecl xml_parser::parse(char const *,unsigned __int64,bool)" >> (?parse@xml_parser@@QEAAXPEBD_K_N@Z) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_GetErrorCode referenced in function "public: void >> __cdecl xml_parser::parse(char const *,unsigned __int64,bool)" >> (?parse@xml_parser@@QEAAXPEBD_K_N@Z) >> ooofilereader.lib(xml_parser.obj) : error LNK2019: unresolved external >> symbol __imp_XML_Parse referenced in function "public: void __cdecl >> xml_parser::parse(char const *,unsigned __int64,bool)" >> (?parse@xml_parser@@QEAAXPEBD_K_N@Z) >> ../../../../wntmsci12.pro/bin/x64/ooofilt.dll : fatal error LNK1120: 13 >> unresolved externals > > I've seen that before ... somehow -DXML_STATIC is not getting passed on > the compiler command line. I added that to solenv/inc/settings.mk and > solenv/gbuild/gbuild.mk. Since the 64-bit part of the build is > breaking, that define must not be getting passed there. I'm guessing > that -DXML_STATIC needs to be added to solenv/inc/set_wntx64.mk.
Try this (totally untested) patch: diff --git a/main/solenv/inc/set_wntx64.mk b/main/solenv/inc/set_wntx64.mk index 58a037c14c..d62b420f32 100644 --- a/main/solenv/inc/set_wntx64.mk +++ b/main/solenv/inc/set_wntx64.mk @@ -47,6 +47,10 @@ USE_CDEFS_X64+= -DWIN32 -D_AMD64_=1 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO USE_CFLAGS_X64+=-Zi -Fd$(MISC_X64)/$(@:b).pdb USE_CDEFS_X64+=-DDEBUG .ENDIF # "$(debug)"!="" +# Required for correct Windows function call ABI for expat static library +.IF "$(SYSTEM_EXPAT)"=="NO" +USE_CDEFS_X64+=-DXML_STATIC +.ENDIF USE_CFLAGS_X64+=$(CFLAGS_X64) USE_CDEFS_X64+=$(CDEFS_X64) INCLUDE_X64=$(subst,/stl$(SPACECHAR),dont_use_stl$(SPACECHAR) $(INCLUDE)) If it works, feel free to commit it. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
