openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Matthias Seidel <matthias.sei...@hamburg.de>
Subject 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.
Date Thu, 03 Oct 2019 14:32:01 GMT
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 truckman@apache.org:
> 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 <truckman@apache.org>
> 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)"!=""
>
>


Mime
View raw message