Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

Matthias Seidel
Breaks now when building the shell extension:

1 module(s):
        shell
need(s) to be rebuilt

Reason(s):

ERROR: error 65280 occurred while making
/cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/ooofilt

When you have fixed the errors in that module you can resume the build
by running:

        build --from shell

Am 03.10.19 um 06:56 schrieb [hidden email]:

> This is an automated email from the ASF dual-hosted git repository.
>
> truckman pushed a commit to branch AOO42X
> in repository https://gitbox.apache.org/repos/asf/openoffice.git
>
>
> The following commit(s) were added to refs/heads/AOO42X by this push:
>      new a39a14b  Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.
> a39a14b is described below
>
> commit a39a14b97884e55830b5c6ef6fa08bd3b8e060b0
> Author: Don Lewis <[hidden email]>
> AuthorDate: Wed Oct 2 17:50:49 2019 -0700
>
>     Remove loadlibrary.obj build from 64-bit Windows build as well.
>     This will fix the Windows 32-bit build of expat on 64-bit Windows
>     when the --enable-win-x64-shellext configure option is specified.
>    
>     Clean up loadlibrary.obj leftovers.
> ---
>  main/expat/expat-2.2.9.patch | 22 +++++-----------------
>  1 file changed, 5 insertions(+), 17 deletions(-)
>
> diff --git a/main/expat/expat-2.2.9.patch b/main/expat/expat-2.2.9.patch
> index 96e23a5..beb860d 100644
> --- a/main/expat/expat-2.2.9.patch
> +++ b/main/expat/expat-2.2.9.patch
> @@ -1,6 +1,6 @@
>  --- misc/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:33:55 2008
>  +++ misc/build/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:26:42 2008
> -@@ -1 +1,91 @@
> +@@ -1 +1,79 @@
>  -dummy
>  +#**************************************************************
>  +#  
> @@ -49,19 +49,13 @@
>  +UNICODE_SLOFILES=$(SLO)$/xmlparse.obj
>  +UNICODECDEFS+=-DXML_UNICODE
>  +
> -+#.IF "$(OS)"=="WNT"
> -+# LOADLIBOBJFILE=$(SLO)/loadlibrary.obj
> -+#.ELSE
> -+# LOADLIBOBJFILE=
> -+#.ENDIF
> -+
>  +LIB1ARCHIV=$(LB)$/libascii_$(TARGET)_xmlparse.a
>  +LIB1TARGET=$(SLB)$/ascii_$(TARGET)_xmlparse.lib
> -+LIB1OBJFILES=$(SLO)$/xmlparse.obj $(LOADLIBOBJFILE)
> ++LIB1OBJFILES=$(SLO)$/xmlparse.obj
>  +
>  +LIB2ARCHIV=$(LB)$/lib$(TARGET)_xmlparse.a
>  +LIB2TARGET=$(SLB)$/$(TARGET)_xmlparse.lib
> -+LIB2OBJFILES =$(REAL_UNICODE_SLOFILES) $(LOADLIBOBJFILE)
> ++LIB2OBJFILES =$(REAL_UNICODE_SLOFILES)
>  +
>  +LIB3ARCHIV=$(LB)$/lib$(TARGET)_xmltok.a
>  +LIB3TARGET=$(SLB)$/$(TARGET)_xmltok.lib
> @@ -72,19 +66,13 @@
>  +#  use UNICODE only because shell/shlxthandler
>  +#  doesn't link against ascii_expat_xmlparse
>  +#---------------------------------------------------------
> -+.IF "$(OS)"=="WNT"
> -+ LOADLIBOBJFILE_X64=$(SLO_X64)/loadlibrary.obj
> -+.ELSE
> -+ LOADLIBOBJFILE_X64=
> -+.ENDIF
>  +SLOFILES_X64=$(SLO_X64)$/xmlparse.obj \
>  +             $(SLO_X64)$/xmlrole.obj \
> -+             $(SLO_X64)$/xmltok.obj \
> -+             $(LOADLIBOBJFILE_X64)
> ++             $(SLO_X64)$/xmltok.obj
>  +CDEFS_X64+=-DXML_UNICODE -DWIN32
>  +CFLAGS_X64+=-I..
>  +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET)_xmlparse.lib
> -+LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj  $(LOADLIBOBJFILE_X64)
> ++LIB1OBJFILES_X64=$(SLO_X64)$/xmlparse.obj
>  +LIB2TARGET_X64=$(SLB_X64)$/$(TARGET)_xmltok.lib
>  +LIB2OBJFILES_X64=$(SLO_X64)$/xmlrole.obj $(SLO_X64)$/xmltok.obj
>  +.ENDIF # "$(BUILD_X64)"!=""
>
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

Don Lewis-2
On  3 Oct, Matthias Seidel wrote:

> Breaks now when building the shell extension:
>
> 1 module(s):
>         shell
> need(s) to be rebuilt
>
> Reason(s):
>
> ERROR: error 65280 occurred while making
> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/ooofilt
>
> When you have fixed the errors in that module you can resume the build
> by running:
>
>         build --from shell

Can you send me the output from "build --from shell" showing the actual
errors?  I can't test it with 64-bit Windows.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

Matthias Seidel
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

---8<---

Am 03.10.19 um 19:56 schrieb Don Lewis:

> On  3 Oct, Matthias Seidel wrote:
>> Breaks now when building the shell extension:
>>
>> 1 module(s):
>>         shell
>> need(s) to be rebuilt
>>
>> Reason(s):
>>
>> ERROR: error 65280 occurred while making
>> /cygdrive/c/Source/openoffice/main/shell/source/win32/shlxthandler/ooofilt
>>
>> When you have fixed the errors in that module you can resume the build
>> by running:
>>
>>         build --from shell
> Can you send me the output from "build --from shell" showing the actual
> errors?  I can't test it with 64-bit Windows.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


smime.p7s (5K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

Don Lewis-2
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.


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

Don Lewis-2
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: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [openoffice] branch AOO42X updated: Remove loadlibrary.obj build from 64-bit Windows build as well. This will fix the Windows 32-bit build of expat on 64-bit Windows when the --enable-win-x64-shellext configure option is specified.

Matthias Seidel
Hi Don,

Applied your patch, build was successful and Windows search seems to
work on 64bit.
Thanks again for your work!

I will now start a build with more languages and upload it to my home
directory (probably tomorrow).

@Jim: This might be something we want to backport to 4.1.8?

Regards,

   Matthias

Am 04.10.19 um 06:03 schrieb Don Lewis:

> 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: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


smime.p7s (5K) Download Attachment