diff --git a/package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch b/package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch new file mode 100644 index 0000000000..12b376744e --- /dev/null +++ b/package/libnss/0001-Bug-1771036-Fix-build-failure-on-Aarch64-host.patch @@ -0,0 +1,37 @@ +From 9d5900c1ee9000906a90923e861b0fd7f1061cde Mon Sep 17 00:00:00 2001 +From: Giulio Benetti +Date: Tue, 24 May 2022 23:40:45 +0200 +Subject: [PATCH] Bug 1771036 - Fix build failure on Aarch64 host + +If trying to build on Aarch64 host for powerpc64 target we can't override +the LDFLAGS leading to this build failure: +gcc: error: unrecognized command-line option '-m64' + +So let's add NATIVE_LDFLAGS check and use it to link nsinstall. This way +any build environment can pass LDFLAGS that fits better for host +architecture. + +Signed-off-by: Giulio Benetti +[upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1771036] +--- + coreconf/nsinstall/Makefile | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 08dfbc2fe..5061789ff 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -34,6 +34,10 @@ ifdef NATIVE_FLAGS + OS_CFLAGS=$(NATIVE_FLAGS) + endif + ++ifdef NATIVE_LDFLAGS ++LDFLAGS=$(NATIVE_LDFLAGS) ++endif ++ + include $(DEPTH)/coreconf/rules.mk + + # Redefine MAKE_OBJDIR for just this directory +-- +2.34.1 + diff --git a/package/libnss/libnss.mk b/package/libnss/libnss.mk index 540092dfcf..0d0f1d84b9 100644 --- a/package/libnss/libnss.mk +++ b/package/libnss/libnss.mk @@ -92,7 +92,9 @@ define LIBNSS_BUILD_CMDS SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ DIST=$(@D)/$(LIBNSS_DISTDIR) \ CHECKLOC= \ - $(LIBNSS_BUILD_VARS) NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX" + $(LIBNSS_BUILD_VARS) \ + NATIVE_FLAGS="$(HOST_CFLAGS) -DLINUX" \ + NATIVE_LDFLAGS="$(HOST_LDFLAGS)" endef define LIBNSS_INSTALL_STAGING_CMDS