configure.ac | 8 -------- external/nss/ExternalProject_nss.mk | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-)
New commits: commit 5cdf540c72f028672f5b40396b5206e9909506f5 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Jan 26 16:36:54 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Mon Jan 26 18:29:59 2026 +0100 Revert "Set up pkg-config environment variables when cross-compiling to Linux" This reverts commit f63f00c6118bf65ba711e068380ac94bb9418e4e. Change-Id: I436236e17cd3d2387b905a02c972b70e2456929f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198155 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/configure.ac b/configure.ac index 01ec19398d7e..b739b6c9e147 100644 --- a/configure.ac +++ b/configure.ac @@ -4328,14 +4328,6 @@ fi if test "$cross_compiling" = "yes"; then export CROSS_COMPILING=TRUE - if test "$_os" = "Linux"; then - if test -d /usr/lib/$host_cpu-$host_os/pkgconfig; then - export PKG_CONFIG_LIBDIR=/usr/lib/$host_cpu-$host_os/pkgconfig - if test -d /usr/share/pkgconfig; then - export PKG_CONFIG_PATH=/usr/share/pkgconfig - fi - fi - fi if test "$enable_dynamic_loading" != yes -a "$enable_wasm_strip" = yes; then ENABLE_WASM_STRIP=TRUE fi commit caccacb1b8299ab4c3f5e95eed89f0ddb15c82ca Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Jan 26 16:36:36 2026 +0200 Commit: Tor Lillqvist <[email protected]> CommitDate: Mon Jan 26 18:29:50 2026 +0100 Revert "Move the CROSS_COMPILE, USE_X64, and CPU_ARCH to be make command line args" This reverts commit c609f555e72cbf211e884b1b7798237ddf90a5f7. Change-Id: I436236e17cd3d2387b905a02c972b70e2456929e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198154 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 278f82ab5e9b..cd198051c017 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -55,6 +55,8 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(SRCDIR)/external/nss/nsinstall.py $(call gb_Trace_StartRange,nss,EXTERNAL) $(call gb_ExternalProject_run,build,\ + $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1 CPU_ARCH=x86_64)) \ + $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ $(if $(filter POWERPC64,$(CPUNAME)),USE_64=1 CPU_ARCH=ppc64le) \ $(if $(filter MACOSX,$(OS)),\ MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \ @@ -63,11 +65,9 @@ $(call gb_ExternalProject_get_state_target,nss,build): \ $(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \ $(if $(filter ARM,$(CPUNAME)),NSS_DISABLE_ARM32_NEON=1) \ NSPR_CONFIGURE_OPTS="$(gb_CONFIGURE_PLATFORMS)" \ + $(if $(CROSS_COMPILING),CROSS_COMPILE=1) \ NSDISTMODE=copy \ $(MAKE) \ - $(if $(CROSS_COMPILING),CROSS_COMPILE=1) \ - $(if $(filter ANDROID FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1 CPU_ARCH=x86_64)) \ - $(if $(filter AARCH64,$(CPUNAME)),USE_64=1 CPU_ARCH=aarch64) \ AR="$(AR)" \ RANLIB="$(RANLIB)" \ NMEDIT="$(NM)edit" \
