diff options
Diffstat (limited to 'editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk')
| -rw-r--r-- | editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk b/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk index 153523d..c7bfec5 100644 --- a/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk +++ b/editors/libreoffice/files/patch-testtools__source__bridgetest__makefile.mk @@ -1,11 +1,19 @@ ---- ./testtools/source/bridgetest/makefile.mk.orig 2012-04-17 11:41:16.000000000 +0200 -+++ ./testtools/source/bridgetest/makefile.mk 2012-04-17 11:41:53.000000000 +0200 -@@ -56,6 +56,8 @@ - my_components += testComponent - .END +--- ./testtools/source/bridgetest/makefile.mk.orig 2012-08-08 09:00:06.000000000 -0400 ++++ ./testtools/source/bridgetest/makefile.mk 2012-08-22 16:18:28.000000000 -0400 +@@ -145,16 +145,6 @@ -+CFLAGSCXX += -fPIC -+ - .IF "$(GUI)"=="WNT" - .IF "$(compcheck)" != "" - CFLAGSCXX += -DCOMPCHECK + 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 +- cd $(DLLDEST) && $(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/uno \ +- -ro uno_services.rdb -ro uno_types.rdb \ +- -s com.sun.star.test.bridge.BridgeTest -- \ +- com.sun.star.test.bridge.CppTestObject +-.ENDIF +-.ENDIF + + $(DLLDEST)/services.rdb : + $(COPY) $(SOLARXMLDIR)/ure/services.rdb $@ |
