external/nss/ExternalProject_nss.mk | 6 +++++- external/nss/nss-ios.patch | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit a8c24b25fd9fb21097a08a22797bf61b59099ea1 Author: Tor Lillqvist <[email protected]> Date: Tue Oct 21 01:49:38 2014 +0300 Cross-compilation fix Change-Id: I205afbd9c1cbe3a286359036cbdcf6aa9d986f71 diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 6d2ab45..f518bb4 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -72,7 +72,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject $(if $(filter IOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \ NSINSTALL="$(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py") \ NSDISTMODE=copy \ - $(MAKE) -j1 AR="$(AR)" RANLIB="$(RANLIB)" NMEDIT="$(NM)edit" nss_build_all \ + $(MAKE) -j1 AR="$(AR)" \ + RANLIB="$(RANLIB)" \ + NMEDIT="$(NM)edit" \ + $(if $(CROSS_COMPILING),NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)") \ + nss_build_all \ && rm -f $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.a \ $(if $(filter MACOSX,$(OS)),\ && chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \ commit bf8fb8cfc3d08bf251b2099db6590af6c09c015e Author: Tor Lillqvist <[email protected]> Date: Tue Oct 21 01:48:36 2014 +0300 Make the patch apply again after NSS update Change-Id: I935188ee90b4c56c5a4d7cc374a26e4b182beb5f diff --git a/external/nss/nss-ios.patch b/external/nss/nss-ios.patch index 0601573..d4107d7 100644 --- a/external/nss/nss-ios.patch +++ b/external/nss/nss-ios.patch @@ -85,9 +85,9 @@ #define _PR_SI_ARCHITECTURE "arm" +#elif defined(__arm64__) +#define _PR_SI_ARCHITECTURE "arm64" + #elif defined(__aarch64__) + #define _PR_SI_ARCHITECTURE "aarch64" #else - #error "Unknown CPU architecture" - #endif --- a/a/nspr/pr/src/Makefile.in +++ a/a/nspr/pr/src/Makefile.in @@ -180,7 +180,7 @@ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
