external/cairo/ExternalProject_pixman.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc7068d648a98619827c2f94374549e3ae2fad65
Author:     Caolán McNamara <[email protected]>
AuthorDate: Wed Nov 30 09:13:53 2022 +0000
Commit:     Caolán McNamara <[email protected]>
CommitDate: Wed Nov 30 12:12:15 2022 +0100

    if we --disable-arm-neon then also use the new --disable-arm-a64-neon
    
    alternatively -fno-integrated-as is a suggestion at
    https://gitlab.freedesktop.org/pixman/pixman/-/issues/45
    
    Change-Id: I9b16d235d24f3d0a87507bdd0c6d5d397ac45d91
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143481
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <[email protected]>

diff --git a/external/cairo/ExternalProject_pixman.mk 
b/external/cairo/ExternalProject_pixman.mk
index 39d5beecf993..9293b9234013 100644
--- a/external/cairo/ExternalProject_pixman.mk
+++ b/external/cairo/ExternalProject_pixman.mk
@@ -25,7 +25,7 @@ $(call gb_ExternalProject_get_state_target,pixman,build) :
        $(call gb_ExternalProject_run,build,\
                $(gb_RUN_CONFIGURE) ./configure \
                $(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
-               $(if $(filter ANDROID,$(OS)),--disable-arm-simd 
--disable-arm-neon --disable-arm-iwmmxt) \
+               $(if $(filter ANDROID,$(OS)),--disable-arm-simd 
--disable-arm-neon --disable-arm-a64-neon --disable-arm-iwmmxt) \
                $(gb_CONFIGURE_PLATFORMS) \
                $(if $(CROSS_COMPILING),$(if $(filter INTEL 
ARM,$(CPUNAME)),ac_cv_c_bigendian=no)) \
                $(if $(filter EMSCRIPTEN,$(OS)),CFLAGS="-pthread") \

Reply via email to