Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15222 from cotequeiroz/nss_pic_quilt

Browse source 
nss: quote $(PIC) usage and fix compilation with QUILT
This commit is contained in:
Eneas U de Queiroz 2021-03-22 09:37:09 -03:00 committed by GitHub
commit 42ab960aa7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libs/nss/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nss PKG_NAME:=nss
PKG_VERSION:=3.61 PKG_VERSION:=3.61
PKG_RELEASE:=1 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \ PKG_SOURCE_URL:= \
@ -80,7 +80,7 @@ MAKE_FLAGS += \
NSS_USE_SYSTEM_SQLITE=1 \ NSS_USE_SYSTEM_SQLITE=1 \
OS_ARCH=Linux \ OS_ARCH=Linux \
OS_TEST=$(ARCH) \ OS_TEST=$(ARCH) \
fpic=$(FPIC) \ fpic="$(FPIC)" \
NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \ NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \
SEED_ONLY_DEV_URANDOM=1 \ SEED_ONLY_DEV_URANDOM=1 \
NS_USE_GCC=1 \ NS_USE_GCC=1 \
@ -91,13 +91,10 @@ MAKE_FLAGS += \
OS_REL_CFLAGS="$(TARGET_CFLAGS)" OS_REL_CFLAGS="$(TARGET_CFLAGS)"
#native compile nsinstall #native compile nsinstall
define Build/Prepare define Build/Configure
$(call Build/Prepare/Default)
ifeq ($(QUILT),)
USE_NATIVE=1 OS_REL_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ USE_NATIVE=1 OS_REL_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
CC="$(HOSTCC)" CPU_ARCH="$(HOST_ARCH)" \ CC="$(HOSTCC)" CPU_ARCH="$(HOST_ARCH)" \
$(MAKE) -C $(PKG_BUILD_DIR)/nss/coreconf/nsinstall $(MAKE) -C $(PKG_BUILD_DIR)/nss/coreconf/nsinstall
endif
endef endef
define Build/Compile define Build/Compile