diff options
Diffstat (limited to 'patches/nss-3.47/0001-nss-fix-nsinstall-build.patch')
| -rw-r--r-- | patches/nss-3.47/0001-nss-fix-nsinstall-build.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch b/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch new file mode 100644 index 000000000..ab3f9133e --- /dev/null +++ b/patches/nss-3.47/0001-nss-fix-nsinstall-build.patch @@ -0,0 +1,43 @@ +From: Wenzong Fan <wenzong.fan@windriver.com> +Date: Tue, 12 Apr 2016 11:33:52 +0200 +Subject: [PATCH] nss: fix nsinstall build + +Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> +--- + nss/coreconf/nsinstall/Makefile | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 1850bcb93cf7..75297de39ce1 100644 +--- a/nss/coreconf/nsinstall/Makefile ++++ b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++CFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + else |