openoffice-3-devel build breaks at amd64: File not found: libgcc3_uno.so [fix]

[Marcin Cieslak]

Hello,

My DEV300_m5 build fails on amd64 because of this part of file/patch-i85216:

@@ -492,7 +492,7 @@
  unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
         void ** slots, unsigned char * code,
         typelib_InterfaceTypeDescription const * type, sal_Int32
nFunctionOffset,
-       sal_Int32 functionCount, sal_Int32 nVtableOffset )
+       sal_Int32 /* functionCount */, sal_Int32 nVtableOffset )
  {
         for ( sal_Int32 nPos = 0; nPos < type->nMembers; ++nPos )
         {

The compilation has a problem here:

aking: ../../../unxfbsdx/slo/cpp2uno.obj
ccache c++  -fmessage-length=0 -c -g  -O0   -DLEAK_STATIC_DATA -I.
-I../../../unxfbsdx/inc/gcc3_uno -I../inc -I../../../inc/pch -I../../../inc
-I../../../unx/inc -I../../../unxfbsdx/inc -I.
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/solver/300/unxfbsdx/inc/stl
-I/usr/obj/usr/ports/editors
/openoffice.org-3-devel/work/DEV300_m5/solver/300/unxfbsdx/inc/external
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/solver/300/unxfbsd
x/inc
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/solenv/unxfbsdx/inc
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_
m5/solenv/inc
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/res
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/solve
r/300/unxfbsdx/inc/stl
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/solenv/inc/Xp31
-I/usr/local/jdk1.5.0/include -I/usr/local/jdk1.5.0
/include/freebsd -I/usr/local/jdk1.5.0/include/bsd
-I/usr/local/jdk1.5.0/include/linux
-I/usr/local/jdk1.5.0/include/native_threads/include -I/usr/local/incl
ude
-I/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/solver/300/unxfbsdx/inc/offuh
-I. -I../../../res -I. -pipe  -fvisibility-inlines-h
idden -g -Wall -Wextra -Wendif-labels -Wshadow -Wno-ctor-dtor-privacy
-Wno-non-virtual-dtor  -fno-omit-frame-pointer  -fpic -DFREEBSD -DUNX
-DVCL -DGCC -
DC341 -DX86_64 -D_STLP_DEBUG -DCVER=C341 -DX86_64  -D_PTHREADS -D_REENTRANT
-DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=450
-DHAVE_GCC_VISIBILITY_FEATUR
E -D__DMAKE -DUNIX -DCPPU_ENV=gcc3 -DGXX_INCLUDE_PATH=/usr/include/c++/4.2
-DSUPD=300 -DDEBUG -DDBG_UTIL -DOSL_DEBUG_LEVEL=2 -DCUI -DSOLAR_JAVA
-DDEV300=DEV3
00   -DSHAREDLIB -D_DLL_   -fexceptions -fno-enforce-eh-specs
-DEXCEPTIONS_ON
-o ../../../unxfbsdx/slo/cpp2uno.o
/usr/obj/usr/ports/editors/openoffice.org-3
-devel/work/DEV300_m5/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx
/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx:
In static member function 'static un
signed char*
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(bridges::cpp_uno::shared::VtableFactory::Slot**,
unsigned char*, const typelib_Interf
aceTypeDescription*, sal_Int32, sal_Int32, sal_Int32)':
/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx:501:
error: 'functionCount' was not declared in this scope
dmake:  Error code 1, while making '../../../unxfbsdx/slo/cpp2uno.obj'

But the build progresses happily and fails at the very end:


... analyzing files ...
ERROR: The following files could not be found:
ERROR: File not found: libgcc3_uno.so
ERROR: File not found: libbf_swfx.so
ERROR: File not found: liblocaledata_en.so
ERROR: File not found: liblocaledata_es.so
ERROR: File not found: liblocaledata_euro.so
ERROR: File not found: liblocaledata_others.so
ERROR: File not found: libswfx.so
ERROR: File not found: libswdfx.so
ERROR: File not found: libswuifx.so
ERROR: File not found: bf_swen-US.res
ERROR: File not found: swen-US.res
... cleaning the output tree ...
... removing directory
/usr/obj/usr/ports/editors/openoffice.org-3-devel/work/DEV300_m5/ooopackaging/i_476891207512987
...
Sun Apr  6 22:16:38 2008 (00:11 min.)
dmake:  Error code 255, while making 'openoffice_en-US.bsd'

The reason why this works for openoffice-2 is that this patch-i85216
works on revision 1.2 of 
udk/bridges/source/cpp_uno/gcc3_freebsd_x86-64/cpp2uno.cxx, that does 
not use "functionCount" parameter.

However, in DEV300_m5 we have revision 1.4 of this file and this patch 
is no longer correct (although it still applies cleanly it seems).

--Marcin


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 273 bytes
Desc: OpenPGP digital signature
Url : http://lists.freebsd.org/pipermail/freebsd-openoffice/attachments/20080410/c2e5ec97/signature.pgp