Received: by mail.netbsd.org (Postfix, from userid 605) id 9E27284E03; Sat, 10 Nov 2018 21:35:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8F53484DF6 for ; Sat, 10 Nov 2018 21:35:08 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id J73ZweFBDAKJ for ; Sat, 10 Nov 2018 21:35:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 5B61484D71 for ; Sat, 10 Nov 2018 21:35:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 54A6AFB1F; Sat, 10 Nov 2018 21:35:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1541885707166110" MIME-Version: 1.0 Date: Sat, 10 Nov 2018 21:35:07 +0000 From: "matthew green" Subject: CVS commit: pkgsrc/misc/libreoffice To: pkgsrc-changes@NetBSD.org Reply-To: mrg@netbsd.org X-Mailer: log_accum Message-Id: <20181110213507.54A6AFB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1541885707166110 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mrg Date: Sat Nov 10 21:35:07 UTC 2018 Modified Files: pkgsrc/misc/libreoffice: distinfo pkgsrc/misc/libreoffice/patches: patch-configure.ac Added Files: pkgsrc/misc/libreoffice/patches: patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk Log Message: make this build on netbsd/arm64. it was surprisingly easy: - match arm64 and netbsd. - add a configuration for it. this builds and attempts to run. i get a crash deep inside some very long stacks in a function that's fully demangled name is over 500 characters long that ends in ::_M_find_before_node(), when trying to open a docx (fresh or existing.) creating a fresh spreadsheet works, but i don't have one handy to test that existing does too. didn't try other parts. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 pkgsrc/misc/libreoffice/distinfo cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/libreoffice/patches/patch-configure.ac cvs rdiff -u -r0 -r1.1 \ pkgsrc/misc/libreoffice/patches/patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1541885707166110 Content-Disposition: inline Content-Length: 6951 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/libreoffice/distinfo diff -u pkgsrc/misc/libreoffice/distinfo:1.63 pkgsrc/misc/libreoffice/distinfo:1.64 --- pkgsrc/misc/libreoffice/distinfo:1.63 Fri Oct 5 13:37:21 2018 +++ pkgsrc/misc/libreoffice/distinfo Sat Nov 10 21:35:07 2018 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.63 2018/10/05 13:37:21 ryoon Exp $ +$NetBSD: distinfo,v 1.64 2018/11/10 21:35:07 mrg Exp $ SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b @@ -216,7 +216,7 @@ SHA1 (patch-Makefile.in) = 5bb39185b12d5 SHA1 (patch-autogen.sh) = eedd0091745cf6a32ee9b33227502baaa661270e SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__intel_share.hxx) = c1f5a013b88e847dd9ecfb4e4abe78b1b5965a0b SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = f7eaf2748c66a27a772fdbdb370a4c6b3bdafca4 -SHA1 (patch-configure.ac) = 4288e452fed2750eb76578b6d66b3b013d1e7177 +SHA1 (patch-configure.ac) = 7e7d4b8bc3064aac7c1689026b7c210587f80bdd SHA1 (patch-desktop_scripts_soffice.sh) = 8017e34da0da404d106397288da02fae4aef4bfc SHA1 (patch-desktop_unx_source_pagein.c) = 0aa2b289df6d0fa524bf057d532aa5f9ceb6dde5 SHA1 (patch-download.lst) = 67cca256cd426895e31285713b7538db25e05e1c @@ -237,6 +237,7 @@ SHA1 (patch-lotuswordpro_source_filter_l SHA1 (patch-mysqlc_Library__mysqlc.mk) = c5560b4739cf54b8207c7d9dfa2a22ffeeee8cfd SHA1 (patch-opencl_source_openclconfig.cxx) = 2178f73aa08148cfd54d9a8c79eb29bf535f2e6b SHA1 (patch-solenv_gbuild_Module.mk) = cbd6ca3acae187458e49fe76d973e6475ed5fe1d +SHA1 (patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk) = eda8dbd0e9394b2dde2f98c0df39e7e9888f49dc SHA1 (patch-svx_source_gengal_gengal.sh) = 3313785a2cf2d22634a28fd6cf7a0ff19afcea62 SHA1 (patch-vcl_Executable__visualbackendtest.mk) = 2db5f3e7daabb2a79181de5e136de019d5264b58 SHA1 (patch-vcl_inc_scrptrun.h) = 52877f7f6c867e2baeed525c200ce7d75a97574a Index: pkgsrc/misc/libreoffice/patches/patch-configure.ac diff -u pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.11 pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.12 --- pkgsrc/misc/libreoffice/patches/patch-configure.ac:1.11 Sat Aug 18 00:11:32 2018 +++ pkgsrc/misc/libreoffice/patches/patch-configure.ac Sat Nov 10 21:35:07 2018 @@ -1,8 +1,27 @@ -$NetBSD: patch-configure.ac,v 1.11 2018/08/18 00:11:32 ryoon Exp $ +$NetBSD: patch-configure.ac,v 1.12 2018/11/10 21:35:07 mrg Exp $ ---- configure.ac.orig 2018-08-02 19:54:54.000000000 +0000 -+++ configure.ac -@@ -6008,14 +6008,14 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG +add arm64 support. + +fix __cxa_exception check. + +fix wrong default paths. + + +--- configure.ac.orig 2018-09-20 09:44:38.000000000 +0000 ++++ configure.ac 2018-11-10 09:32:15.242164059 +0000 +@@ -4286,6 +4286,11 @@ + P_SEP=: + + case "$host_cpu" in ++ aarch64) ++ CPUNAME=AARCH64 ++ RTL_ARCH=AARCH64 ++ PLATFORMID=netbsd_aarch64 ++ ;; + i*86) + CPUNAME=INTEL + RTL_ARCH=x86 +@@ -6013,14 +6018,14 @@ ], [AC_MSG_RESULT([no])]) AC_LANG_POP([C++]) @@ -20,7 +39,7 @@ $NetBSD: patch-configure.ac,v 1.11 2018/ AC_MSG_RESULT([yes]) ], [AC_MSG_RESULT([no])]) AC_LANG_POP([C++]) -@@ -7607,7 +7607,7 @@ else +@@ -7612,7 +7617,7 @@ if test "$COM" = "MSC"; then LIBJPEG_LIBS="${WORKDIR}/UnpackedTarball/libjpeg-turbo/.libs/libjpeg.lib" else @@ -29,7 +48,7 @@ $NetBSD: patch-configure.ac,v 1.11 2018/ fi case "$host_cpu" in -@@ -9203,11 +9203,11 @@ dnl HarfBuzz +@@ -9208,11 +9213,11 @@ dnl =================================================================== libo_CHECK_SYSTEM_MODULE([graphite],[GRAPHITE],[graphite2 >= 0.9.3], ["-I${WORKDIR}/UnpackedTarball/graphite/include -DGRAPHITE2_STATIC"], @@ -43,7 +62,7 @@ $NetBSD: patch-configure.ac,v 1.11 2018/ if test "$COM" = "MSC"; then # override the above GRAPHITE_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/graphite.lib" -@@ -10387,7 +10387,7 @@ if test "$build_for_ios" = "YES"; then +@@ -10410,7 +10415,7 @@ elif test "$enable_mpl_subset" = "yes"; then AC_MSG_CHECKING([whether gpgmepp should be disabled due to building just MPL]) AC_MSG_RESULT([yes]) @@ -52,16 +71,16 @@ $NetBSD: patch-configure.ac,v 1.11 2018/ dnl =================================================================== dnl Check for system gpgme dnl =================================================================== -@@ -10397,7 +10397,7 @@ elif test "$_os" = "Linux" -o "$_os" = " +@@ -10420,7 +10425,7 @@ SYSTEM_GPGMEPP=TRUE # C++ library doesn't come with fancy gpgmepp-config, check for headers the old-fashioned way - AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/include/gpgme++ ], -+ AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I@PREFIX@/include/gpgme++ ], ++ AC_CHECK_HEADER(gpgme++/gpgmepp_version.h, [ GPGMEPP_CFLAGS=-I/usr/pkg/include/gpgme++ ], [AC_MSG_ERROR([gpgmepp headers not found, install gpgmepp development package])], []) # progress_callback is the only func with plain C linkage # checking for it also filters out older, KDE-dependent libgpgmepp versions -@@ -11730,8 +11730,8 @@ EOF +@@ -11753,8 +11758,8 @@ dnl Checking for ant.jar if test "$ANT_HOME" != "NO_ANT_HOME"; then AC_MSG_CHECKING([Ant lib directory]) Added files: Index: pkgsrc/misc/libreoffice/patches/patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk diff -u /dev/null pkgsrc/misc/libreoffice/patches/patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk:1.1 --- /dev/null Sat Nov 10 21:35:07 2018 +++ pkgsrc/misc/libreoffice/patches/patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk Sat Nov 10 21:35:07 2018 @@ -0,0 +1,27 @@ +$NetBSD: patch-solenv_gbuild_platform_NETBSD_AARCH64_GCC.mk,v 1.1 2018/11/10 21:35:07 mrg Exp $ + +add arm64 build support. + +--- /dev/null 2018-11-10 16:23:15.111425461 +0000 ++++ solenv/gbuild/platform/NETBSD_AARCH64_GCC.mk 2018-11-10 09:48:59.182425793 +0000 +@@ -0,0 +1,20 @@ ++# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- ++# ++# This file is part of the LibreOffice project. ++# ++# This Source Code Form is subject to the terms of the Mozilla Public ++# License, v. 2.0. If a copy of the MPL was not distributed with this ++# file, You can obtain one at http://mozilla.org/MPL/2.0/. ++# ++ ++#please make generic modifications to unxgcc.mk ++ ++gb_COMPILEROPTFLAGS := -O -g ++ ++include $(GBUILDDIR)/platform/unxgcc.mk ++ ++NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib ++ ++gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/.libs:$(NB_ADD_LIBPATH) ++ ++# vim: set noet sw=4: --_----------=_1541885707166110--