From patchwork Mon Jul 27 11:51:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1336887 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=Z9vLeUPJ; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BFdT32q8Dz9sPf for ; Mon, 27 Jul 2020 21:52:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id E3E0587F78; Mon, 27 Jul 2020 11:52:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EL3YDalsDGgA; Mon, 27 Jul 2020 11:52:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3701487F48; Mon, 27 Jul 2020 11:52:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id AD61D1BF3DF for ; Mon, 27 Jul 2020 11:52:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A494585E6B for ; Mon, 27 Jul 2020 11:52:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UnVnNyN13iRA for ; Mon, 27 Jul 2020 11:52:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-il1-f193.google.com (mail-il1-f193.google.com [209.85.166.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id AEA6384AA7 for ; Mon, 27 Jul 2020 11:52:02 +0000 (UTC) Received: by mail-il1-f193.google.com with SMTP id j9so9401047ilc.11 for ; Mon, 27 Jul 2020 04:52:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ij6nl34UuxjFKUE1ZI8bSkOyNM1sWig2xMRFdnkFQR0=; b=Z9vLeUPJ/dwdmQyVef6t/Pb5emZtCAySSn5Gp7bl4MiJwLcgsefr2F32vb+SalxKej 7EvmJYQwq6hZpQDEW1sxx8s0KD4WCep23Dsmu0LVQVA0QC2uJwgxlqCEg9PQp3dawPH1 wZQuHCor/OI4LS4ExzDAGJ8D7eSUWh8tXQwKseszPqcM9GXvjJ8zGTjEWGfDLaJc79CQ QSwTJCEnB4Al0imf1lXXnM2m+JEoaJOzvlyQC7ymylUFE+/qAiPPGd4cgs4c4E4yiHic SGq6i4jBT+xDT08PtdpSZqBwsVUiojibFmFWFqgmFQvfrvVoQswESMWdBXbkmAeNtR// WBAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Ij6nl34UuxjFKUE1ZI8bSkOyNM1sWig2xMRFdnkFQR0=; b=r0Q98lYzLFhyiXNYUNtUSknajLVdH+3AQK5lv0MKU2QwQE1yjspqVO6LaVduSbObHU 3BuiG7eMWxD1Nh7+J68XVKB7lVfO3t6r63Rdd7YvAelWvF+nr7rEDVkXzCuC4l2hDn1Q 3fk8IwjNUrkRLmOhaykc1fDi46iiDKj219EizUZHF1o7Z4kf4w69YjWnpafUjqfy89Az z+f6n2ZO9Khp6YLs80OYZe+q96A8Qx/0oL1swmAl0mUibypWSOZ2upBUXXcK/YJesVBe rLLXjwqznGDjexn7aum6VOse4UlhXaXOWBPJb4afogpJclDarYXH4zdbnSpk7wP+3qH0 UTHQ== X-Gm-Message-State: AOAM533qvk5mhnGqC5+g2ryyuxZYUqGH1VnhwVlCHEnwIbZ0D3Btg0KG WsdC5lm/+r2zyYmNYMrLmi/98rLo X-Google-Smtp-Source: ABdhPJzYfo4CiVDWFRJlGqgMNqqSAz5NK71e6HFwpkjtF23LF/0A72fBJiN0KSEgq5yVAj2+UuC0Rw== X-Received: by 2002:a92:9108:: with SMTP id t8mr24567534ild.170.1595850721614; Mon, 27 Jul 2020 04:52:01 -0700 (PDT) Received: from james-x399.localdomain (71-218-100-23.hlrn.qwest.net. [71.218.100.23]) by smtp.gmail.com with ESMTPSA id r3sm2517502iov.22.2020.07.27.04.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2020 04:52:00 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Mon, 27 Jul 2020 05:51:55 -0600 Message-Id: <20200727115155.824789-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v7 1/1] package/nodejs: use system-icu for host-nodejs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: James Hilliard , Martin Bark , Daniel Price Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The nodejs configure.py file orders zlib headers before the bundled ICU headers. The zlib headers happen to be located in the system include directory, next to some system ICU headers (not bundled). If these are built before nodejs is, nodejs will get confused and try to use the system ICU headers instead of the bundled ones. Fix this by always using host-icu. Set CXXFLAGS to -DU_DISABLE_RENAMING=1 when building with system-icu since host-icu is built with --disable-renaming. Fixes: - http://autobuild.buildroot.net/results/1ef947553ec762dba6a6202b1cfc84ceed75dbb2/ Signed-off-by: James Hilliard --- package/nodejs/nodejs.mk | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 3f35ac7c33..89bd5177a2 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -10,7 +10,7 @@ NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-icu NODEJS_INSTALL_STAGING = YES NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -26,6 +26,20 @@ NODEJS_CONF_OPTS = \ --cross-compiling \ --dest-os=linux +HOST_NODEJS_CONF_OPTS = \ + --prefix=$(HOST_DIR) \ + --without-snapshot \ + --without-dtrace \ + --without-etw \ + --shared-openssl \ + --shared-openssl-includes=$(HOST_DIR)/include/openssl \ + --shared-openssl-libpath=$(HOST_DIR)/lib \ + --shared-zlib \ + --no-cross-compiling \ + --with-intl=system-icu + +HOST_NODEJS_CXXFLAGS = $(HOST_CXXFLAGS) -DU_DISABLE_RENAMING=1 + ifeq ($(BR2_PACKAGE_OPENSSL),y) NODEJS_DEPENDENCIES += openssl NODEJS_CONF_OPTS += --shared-openssl @@ -57,16 +71,7 @@ define HOST_NODEJS_CONFIGURE_CMDS PATH=$(@D)/bin:$(BR_PATH) \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ - --prefix=$(HOST_DIR) \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ - --shared-openssl \ - --shared-openssl-includes=$(HOST_DIR)/include/openssl \ - --shared-openssl-libpath=$(HOST_DIR)/lib \ - --shared-zlib \ - --no-cross-compiling \ - --with-intl=small-icu \ + $(HOST_NODEJS_CONF_OPTS) \ ) endef @@ -81,6 +86,7 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) @@ -90,6 +96,7 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/bin/python2 \ $(MAKE) -C $(@D) install \ $(HOST_CONFIGURE_OPTS) \ + CXXFLAGS="$(HOST_NODEJS_CXXFLAGS)" \ LDFLAGS.host="$(HOST_LDFLAGS)" \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH)