openoffice-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Don Lewis <truck...@apache.org>
Subject Re: [openoffice] branch trunk updated: Upgrade bundled expat to 2.2.9.
Date Wed, 02 Oct 2019 22:15:32 GMT
On  2 Oct, Matthias Seidel wrote:
> Windows build (42X) breaks:
> 
> =============
> Building module expat
> =============
> 
> Entering /cygdrive/c/Source/openoffice/main/expat
> 
> mkdir: cannot create directory
> './wntmsci12.pro/misc/build/expat-2.2.9/lib': File exists
> Making: ../../../../../wntmsci12.pro/slo/x64/xmltok.obj
> mkdir: cannot create directory '../../../../../wntmsci12.pro/slo/x64/':
> File exists
> xmltok.c
> dmake:  Error: -- `../../../../../wntmsci12.pro/slo/x64/loadlibrary.obj'
> not found, and can't be made
> dmake:  Error code 255, while making
> './wntmsci12.pro/misc/build/so_built_so_expat'
> 
> 1 module(s):
>         expat
> need(s) to be rebuilt
> 
> Reason(s):
> 
> ERROR: error 65280 occurred while making
> /cygdrive/c/Source/openoffice/main/expat
> 
> When you have fixed the errors in that module you can resume the build
> by running:
> 
>         build --from expat

Try this patch:

>From 31f16bbf1db19aa7400a4645ae06369c0a71071b Mon Sep 17 00:00:00 2001
From: Don Lewis <truckman@apache.org>
Date: Wed, 2 Oct 2019 15:10:09 -0700
Subject: [PATCH] Remove loadlibrary.obj build from 64-bit Windows build as
 well.

Clean up loadlibrary.obj leftovers.
---
 main/expat/expat-2.2.9.patch | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/main/expat/expat-2.2.9.patch b/main/expat/expat-2.2.9.patch
index 96e23a5543..3a5012ef12 100644
--- a/main/expat/expat-2.2.9.patch
+++ b/main/expat/expat-2.2.9.patch
@@ -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)"!=""
-- 
2.23.0



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@openoffice.apache.org
For additional commands, e-mail: dev-help@openoffice.apache.org


Mime
View raw message