[Libreoffice] build breaks on i686

[David Tardon]

On Sun, Apr 24, 2011 at 02:43:44PM +0200, Andreas Radke wrote:
> [ build LNK ] Library/vbaobj.uno.so
> [ build CXX ] sw/source/ui/utlui/textcontrolcombo
> [ build CXX ] sw/source/ui/utlui/tmplctrl
> [ build CUT ] sc_ucalc
> [ build CXX ] sw/source/ui/utlui/uiitems
> `.L121' referenced in section `.rodata._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o: defined in discarded section `.text._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[non-virtual thunk to ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o
> `.L122' referenced in section `.rodata._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o: defined in discarded section `.text._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[non-virtual thunk to ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o
> `.L123' referenced in section `.rodata._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o: defined in discarded section `.text._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[non-virtual thunk to ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o
> `.L124' referenced in section `.rodata._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o: defined in discarded section `.text._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[non-virtual thunk to ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o
> `.L124' referenced in section `.rodata._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o: defined in discarded section `.text._ZN19ScVbaCollectionBaseIN4cppu15WeakImplHelper1IN3ooo3vba11XCollectionEEEE4ItemERKN3com3sun4star3uno3AnyESD_[non-virtual thunk to ScVbaCollectionBase<cppu::WeakImplHelper1<ooo::vba::XCollection> >::Item(com::sun::star::uno::Any const&, com::sun::star::uno::Any const&)]' of /build/src/build/solver/300/unxlngi6.pro/workdir/CxxObject/sc/source/ui/vba/vbasheetobjects.o
> collect2: ld returned 1 exit status
> make[1]: *** [/build/src/build/solver/300/unxlngi6.pro/workdir/LinkTarget/Library/vbaobj.uno.so] Error 1
> make[1]: *** Waiting for unfinished jobs....
> [ build CXX ] sw/source/ui/utlui/uitool
> [ build CXX ] sw/source/ui/utlui/unotools
> [ build CXX ] sw/source/ui/utlui/viewlayoutctrl
> [ build CXX ] sw/source/ui/utlui/zoomctrl
> [ build CXX ] sw/source/ui/web/wdocsh
> dmake:  Error code 2, while making 'all'
> 
> 
> This happens only on i686, so I guess it's stlport related. this is the only difference 
> to my x86_64 build that finishes to compile.
> 
> gcc is 4.6.

Caolan fixed similar build problem in Fedora some time ago. Does the
attached patch allow you finish the build?

D.
-------------- next part --------------
--- vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:27:51.507604173 +0000
+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx	2011-01-28 20:28:26.230045727 +0000
@@ -238,7 +238,7 @@
 
 // including a HelperInterface implementation
 template< typename Ifc1 >
-class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
 {
 typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
 protected:
--- sc/Library_vbaobj.mk
+++ sc/Library_vbaobj.mk
@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
         sc/source/ui/vba/vbaquerytable \
         sc/source/ui/vba/vbarange \
         sc/source/ui/vba/vbasheetobject \
-        sc/source/ui/vba/vbasheetobjects \
         sc/source/ui/vba/vbastyle \
         sc/source/ui/vba/vbastyles \
         sc/source/ui/vba/vbatextboxshape \
@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
         sc/source/ui/vba/vbawsfunction \
 ))
 
+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
+        sc/source/ui/vba/vbasheetobjects \
+        , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+
 ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
 $(eval $(call gb_Library_set_ldflags,vbaobj,\
 	$$(LDFLAGS) \