bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx | 4 ++-- sdext/source/pdfimport/makefile.mk | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-)
New commits: commit f233f3973631c664e0953f04f88a58234390c088 Author: Matthias Klose <matthias.kl...@canonical.com> Date: Mon Dec 19 10:51:43 2011 +0100 fix armhf build in bridges Signed-off-by: Bjoern Michaelsen <bjoern.michael...@canonical.com> Signed-off-by: Caolán McNamara <caol...@redhat.com> diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx index 5b02678..9502b87 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx @@ -173,14 +173,14 @@ void MapReturn(sal_uInt32 r0, sal_uInt32 r1, typelib_TypeDescriptionReference * pRegisterReturn[0] = r0; break; case typelib_TypeClass_FLOAT: -#if defined(__ARM_EABI__) || defined(__SOFTFP__) +#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__)) pRegisterReturn[0] = r0; #else *(float*)pRegisterReturn = fret; #endif break; case typelib_TypeClass_DOUBLE: -#if defined(__ARM_EABI__) || defined(__SOFTFP__) +#if !defined(__ARM_PCS_VFP) && (defined(__ARM_EABI__) || defined(__SOFTFP__)) pRegisterReturn[1] = r1; pRegisterReturn[0] = r0; #else commit f2a1882be486986a76682ed51f481595e1cf0d5c Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Fri Dec 16 19:55:37 2011 +0100 fix racecondition in sdext/source/pdfimport/makefile.mk diff --git a/sdext/source/pdfimport/makefile.mk b/sdext/source/pdfimport/makefile.mk index 641e90f..d33680f 100644 --- a/sdext/source/pdfimport/makefile.mk +++ b/sdext/source/pdfimport/makefile.mk @@ -156,11 +156,14 @@ $(COMPONENT_DIALOGS) : dialogs$/$$(@:f) @@-$(MKDIRHIER) $(@:d) $(COPY) $< $@ -$(COMPONENT_DESCRIPTION) : $(DESCRIPTION) +$(COMPONENT_DESCRIPTION) : $(MISC)/descriptions + +$(MISC)/descriptions : $(DESCRIPTION) $(COPY) description-en-US.txt $(EXTENSIONDIR) .IF "$(WITH_LANG)" != "" $(COPY) $(MISC)/$(EXTENSIONNAME)_in/description-*.txt $(EXTENSIONDIR) .ENDIF + $(TOUCH) $@ $(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f) @@-$(MKDIRHIER) $(@:d)
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits