diff options
| author | Eneas U de Queiroz <cotequeiroz@gmail.com> | 2021-03-22 09:37:09 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 09:37:09 -0300 |
| commit | 42ab960aa7538957df2dc0682f52039d428d3e54 (patch) | |
| tree | 9dc69b1f90167b43c00f8892e98d01a5ed006ab6 | |
| parent | ad116f29ceb1470e38bece6b5a71b737f976939b (diff) | |
| parent | fbed6751b044d3c644065cdca37bd37cbb854723 (diff) | |
Merge pull request #15222 from cotequeiroz/nss_pic_quilt
nss: quote $(PIC) usage and fix compilation with QUILT
| -rw-r--r-- | libs/nss/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libs/nss/Makefile b/libs/nss/Makefile index 2785dd2f8..b75922637 100644 --- a/libs/nss/Makefile +++ b/libs/nss/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nss PKG_VERSION:=3.61 -PKG_RELEASE:=1 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ @@ -80,7 +80,7 @@ MAKE_FLAGS += \ NSS_USE_SYSTEM_SQLITE=1 \ OS_ARCH=Linux \ OS_TEST=$(ARCH) \ - fpic=$(FPIC) \ + fpic="$(FPIC)" \ NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \ SEED_ONLY_DEV_URANDOM=1 \ NS_USE_GCC=1 \ @@ -91,13 +91,10 @@ MAKE_FLAGS += \ OS_REL_CFLAGS="$(TARGET_CFLAGS)" #native compile nsinstall -define Build/Prepare - $(call Build/Prepare/Default) -ifeq ($(QUILT),) +define Build/Configure USE_NATIVE=1 OS_REL_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ CC="$(HOSTCC)" CPU_ARCH="$(HOST_ARCH)" \ $(MAKE) -C $(PKG_BUILD_DIR)/nss/coreconf/nsinstall -endif endef define Build/Compile |