Date: prev next · Thread: first prev next last
2020 Archives by date, by thread · List index


Hi,

Am 20.07.20 um 19:38 schrieb Rene Engelhard:

/home/pmenzel/src/core/workdir/LinkTarget/StaticLibrary/liblibpng.a(pngrutil.o):
in function `png_read_filter_row':
pngrutil.c:(.text+0x6658): undefined reference to
`png_init_filter_functions_vsx'
collect2: error: ld returned 1 exit status
make[1]: ***
[/home/pmenzel/src/core/desktop/Executable_oosplash.mk:10:
/home/pmenzel/src/core/instdir/program/oosplash] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:282: build] Error 2
```

Looks like it misses the VSX file for ppc64el. Similar case like
https://cgit.freedesktop.org/libreoffice/core/commit/?id=4855b5771f35ef354fbb5fb00a8cf690d5427c69

Untested patch:


diff --git a/external/libpng/StaticLibrary_libpng.mk
b/external/libpng/StaticLibrary_libpng.mk
index fe2364141b3b..2d56a276f6a7 100644
--- a/external/libpng/StaticLibrary_libpng.mk
+++ b/external/libpng/StaticLibrary_libpng.mk
@@ -38,6 +38,10 @@ $(eval $(call
gb_StaticLibrary_add_generated_cobjects,libpng,\
            UnpackedTarball/libpng/arm/filter_neon_intrinsics \
            UnpackedTarball/libpng/arm/palette_neon_intrinsics \
        ) \
+       $(if $(filter POWERPC POWERPC64,$(CPUNAME)), \
+           UnpackedTarball/libpng/powerpc/powerpc_init \
+           UnpackedTarball/libpng/powerpc/filter_vsx_intrinsics \
+       ) \
 ))
 
 # vim: set noet sw=4 ts=4:

Regards,


Rene


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.