Andrew Geissler | 748a483 | 2020-07-24 16:24:21 -0500 | [diff] [blame^] | 1 | From 2701905e689cf7c1ee7ca2d116f20b5bbc146431 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Sat, 7 Mar 2020 08:34:02 -0800 |
| 4 | Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 5 | |
| 6 | While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will |
| 7 | fail with error: |
| 8 | |
| 9 | * nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled |
| 10 | |
| 11 | It caused by the '-m64' option which passed to host gcc. |
| 12 | |
| 13 | The nsinstall was built first while nss starting to build, it only runs |
| 14 | on host to install built files, it doesn't need any cross-compling or |
| 15 | multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this |
| 16 | error. |
| 17 | |
| 18 | Upstream-Status: Pending |
| 19 | |
| 20 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 21 | =================================================== |
Andrew Geissler | 748a483 | 2020-07-24 16:24:21 -0500 | [diff] [blame^] | 22 | |
| 23 | --- |
| 24 | nss/coreconf/nsinstall/Makefile | 7 +++++++ |
| 25 | 1 file changed, 7 insertions(+) |
| 26 | |
| 27 | diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile |
| 28 | index 08dfbc2..e97fb5f 100644 |
| 29 | --- a/nss/coreconf/nsinstall/Makefile |
| 30 | +++ b/nss/coreconf/nsinstall/Makefile |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 31 | @@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 |
| 32 | |
| 33 | include $(DEPTH)/coreconf/config.mk |
| 34 | |
| 35 | +# nsinstall is unfit for cross-compiling/multilib-build since it was |
| 36 | +# always run on local host to install built files. This change intends |
| 37 | +# to clean the '-m64' from ARCHFLAG and LDFLAGS. |
| 38 | +ARCHFLAG = |
| 39 | +LDFLAGS = |
| 40 | +# CFLAGS = |
| 41 | + |
| 42 | ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) |
| 43 | PROGRAM = |
Andrew Geissler | 748a483 | 2020-07-24 16:24:21 -0500 | [diff] [blame^] | 44 | TARGETS = |