Merge pull request #15222 from cotequeiroz/nss_pic_quilt
nss: quote $(PIC) usage and fix compilation with QUILT
This commit is contained in:
commit
42ab960aa7
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue