bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 3 ++- bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk | 2 +- sal/osl/android/Makefile | 7 ++++--- testtools/com/sun/star/comp/bridge/makefile.mk | 5 ----- testtools/source/bridgetest/idl/makefile.mk | 5 ----- testtools/source/bridgetest/makefile.mk | 13 +++++-------- 6 files changed, 12 insertions(+), 23 deletions(-)
New commits: commit 6f55d5eaec48212f24bd19b351ddedac3059eb8b Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 17 17:40:49 2011 +0200 Do build stuff here also when cross-compiling (but don't run) diff --git a/testtools/com/sun/star/comp/bridge/makefile.mk b/testtools/com/sun/star/comp/bridge/makefile.mk index 0a6b9a8..7083f23 100644 --- a/testtools/com/sun/star/comp/bridge/makefile.mk +++ b/testtools/com/sun/star/comp/bridge/makefile.mk @@ -34,11 +34,6 @@ TARGET=com_sun_star_comp_bridge .INCLUDE : settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - # ------------------------------------------------------------------ .IF "$(SOLAR_JAVA)" != "" diff --git a/testtools/source/bridgetest/idl/makefile.mk b/testtools/source/bridgetest/idl/makefile.mk index dce276e..8b17273 100644 --- a/testtools/source/bridgetest/idl/makefile.mk +++ b/testtools/source/bridgetest/idl/makefile.mk @@ -31,11 +31,6 @@ TARGET := bridgetest_idl .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .INCLUDE: target.mk .IF "$(L10N_framework)"=="" diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index 6481abc..8d2f21b 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -36,11 +36,6 @@ LIBTARGET=NO .INCLUDE: settings.mk -.IF "$(CROSS_COMPILING)"=="YES" -all: - @echo Nothing done when cross-compiling -.ENDIF - .IF "$(L10N_framework)"=="" DLLPRE = # no leading "lib" on .so files @@ -141,6 +136,7 @@ ALLTAR: \ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ $(SHL1TARGETN) $(SHL2TARGETN) $(SHL3TARGETN) +.IF "$(CROSS_COMPILING)"!="YES" .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP" @echo "Mac OSX PPC GCC fails this test!, likely broken UNO bridge. Fix me." .ELSE @@ -149,6 +145,7 @@ runtest : $(DLLDEST)$/uno_types.rdb $(DLLDEST)$/uno_services.rdb makefile.mk \ -s com.sun.star.test.bridge.BridgeTest -- \ com.sun.star.test.bridge.CppTestObject .ENDIF +.ENDIF $(DLLDEST)/services.rdb : $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@ commit 5057892990b310d59d25b161ee54273951afaa91 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 17 17:36:24 2011 +0200 Fix unintentional glitch diff --git a/testtools/source/bridgetest/makefile.mk b/testtools/source/bridgetest/makefile.mk index a798b50..6481abc 100644 --- a/testtools/source/bridgetest/makefile.mk +++ b/testtools/source/bridgetest/makefile.mk @@ -79,7 +79,7 @@ LIB1TARGET=$(SLB)$/cppobj.lib LIB1OBJFILES= \ $(SLO)$/cppobj.obj $(SLO)$/currentcontextchecker.obj $(SLO)$/multi.obj -SHL1TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)cppobj.uno +SHL1TARGET = $(ENFORCEDSHLPREFIX)cppobj.uno SHL1STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -98,7 +98,7 @@ LIB2OBJFILES= \ $(SLO)$/currentcontextchecker.obj \ $(SLO)$/multi.obj -SHL2TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)bridgetest.uno +SHL2TARGET = $(ENFORCEDSHLPREFIX)bridgetest.uno SHL2STDLIBS= \ $(CPPULIB) \ $(CPPUHELPERLIB) \ @@ -109,7 +109,7 @@ SHL2DEF= $(MISC)$/$(SHL2TARGET).def DEF2NAME= $(SHL2TARGET) SHL2VERSIONMAP = $(SOLARENV)/src/component.map -SHL3TARGET = $(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)$(ENFORCEDSHLPREFIX)constructors.uno +SHL3TARGET = $(ENFORCEDSHLPREFIX)constructors.uno SHL3OBJS = $(SLO)$/constructors.obj SHL3STDLIBS = $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) SHL3VERSIONMAP = $(SOLARENV)/src/component.map commit e55ab1e6de1bcf854bcc05ba5e91009dcce507bd Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 17 16:23:11 2011 +0200 Add the gcc3_uno library diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile index ac28f1b..d60618a 100644 --- a/sal/osl/android/Makefile +++ b/sal/osl/android/Makefile @@ -31,11 +31,12 @@ all: # # Then libs and UNO components that the tests from other modules need. # - -for F in uno_cppu \ - uno_salhelpergcc3 \ - uno_cppuhelpergcc3 \ + -for F in gcc3_uno \ reg \ store \ + uno_cppu \ + uno_salhelpergcc3 \ + uno_cppuhelpergcc3 \ xmlreader \ bootstrap.uno; do \ test -f $(OUTDIR)/lib/lib$${F}.so && cp $(OUTDIR)/lib/lib$${F}.so $(SODEST); \ commit e2989c84005cbbc11359adbf310ea16432cbfbec Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Nov 17 16:21:50 2011 +0200 Let's try using the gcc3_linux_arm code for Android, too diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index c21fb76..21c335b 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -39,7 +39,8 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) || defined(DRAGONFLY) + || defined(NETBSD) || defined(DRAGONFLY) \ + || defined(ANDROID) /* Not sure about Android, but let's see... */ #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk index 9048f2c..2524792 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_arm/makefile.mk @@ -39,7 +39,7 @@ NO_BSYMBOLIC=TRUE # --- Files -------------------------------------------------------- -.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" +.IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXRgcc3" || "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCANDROIDRgcc3" CFLAGSCXX += -fno-omit-frame-pointer -fno-strict-aliasing _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits