[Libreoffice-commits] core.git: external/libpng

Caolán McNamara caolanm at redhat.com
Sun Feb 5 08:33:05 UTC 2017


 external/libpng/StaticLibrary_png.mk |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 0d016fc9e784d65802e117dec0afbf2a2d66cc10
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Feb 4 19:09:43 2017 +0000

    arm libpng build fix
    
    Change-Id: I904424251a7d6a84a97e61d18c1a731c66866fae
    Reviewed-on: https://gerrit.libreoffice.org/33917
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/external/libpng/StaticLibrary_png.mk b/external/libpng/StaticLibrary_png.mk
index bad30a3..d781a68 100644
--- a/external/libpng/StaticLibrary_png.mk
+++ b/external/libpng/StaticLibrary_png.mk
@@ -33,6 +33,9 @@ $(eval $(call gb_StaticLibrary_add_generated_cobjects,png,\
 	UnpackedTarball/png/pngwrite \
 	UnpackedTarball/png/pngwtran \
 	UnpackedTarball/png/pngwutil \
+	$(if $(filter ARM,$(CPUNAME)),\
+	    UnpackedTarball/png/arm/arm_init \
+	) \
 ))
 
 # vim: set noet sw=4 ts=4:


More information about the Libreoffice-commits mailing list