summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEneas U de Queiroz <cotequeiroz@gmail.com>2021-03-21 12:28:54 -0300
committerEneas U de Queiroz <cotequeiroz@gmail.com>2021-03-22 08:23:29 -0300
commitfbed6751b044d3c644065cdca37bd37cbb854723 (patch)
tree9dc69b1f90167b43c00f8892e98d01a5ed006ab6
parentc5f91a2a56d9087adbc084d51aa3dae8165970f3 (diff)
nss: fix compilation with QUILT
Commit 657574f45 disabled building the host nsinstall program when using QUILT. However, the host nsinstall is needed to compile the package, breaking compilation with QUILT. Move the native compile to Build/Configure, which will not be called for prepare, refresh, or update targets, but will be called before Build/Compile. nss does not have a configure script, so Build/Configure/Default is not being called. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
-rw-r--r--libs/nss/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/nss/Makefile b/libs/nss/Makefile
index 7aa48a66b..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:=2
+PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= \
@@ -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