Return-Path: Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id D26376D561 for ; Wed, 13 Nov 2019 09:58:13 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id w9so1613295wrr.0 for ; Wed, 13 Nov 2019 01:58:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ew2821PwwGyBhxNA/OUqB6AVnc9Kza6mbAPWLQRqSZw=; b=TfeD+h0HkjqcME6y22sH44ozI/znTGzSFnLRO8kSRHQAsZXV63AeG2VRqJkybzf3Ol rtfM5TelqvYL+uOqlWMAHwRNS8Ih/NEEr299LPzZd0bIuD+xCrNjfuMQ3aBk9aFIH77C o6LRPKytgyZUp4bAiWnKZzjkBcySX73b9fTOwcskFeaqwWYx2+lGwcZ9pdStxNv8GKNl XEZAhSmlkGMjaarI7/03CQHJkIEct0gz/zf1E4QN8ZuWfZZ5Vm0MvkIoNFwQm+ctKXMV R+WnbC7M4EiUxtCSrf7/moC7yXyHNbyDIZ9b/x9VN4rVdg2WXmV+w6NdDFNgVm6Qho+7 5ayg== X-Gm-Message-State: APjAAAVqK7t9kHo9jWGMfvejMYHg2sQnu9PLdVS8ndVcZ+WwZOhthnFb ltr0fg4sPn2BsjOUPTUJSRQqla6f X-Google-Smtp-Source: APXvYqxMgVSUSPaedYDC27/lI2Ju7WxkT7N9vWETnxzhwXKlAHqqYC5cBn0Dd3gl/VwGCSda4Ncx5Q== X-Received: by 2002:adf:d4d0:: with SMTP id w16mr1997932wrk.184.1573639094071; Wed, 13 Nov 2019 01:58:14 -0800 (PST) Received: from 1aq-andre.garage.tyco.com ([77.107.218.170]) by smtp.gmail.com with ESMTPSA id x26sm1660544wmc.14.2019.11.13.01.58.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Nov 2019 01:58:12 -0800 (PST) From: =?UTF-8?q?Andr=C3=A9=20Draszik?= To: openembedded-devel@lists.openembedded.org Date: Wed, 13 Nov 2019 09:58:11 +0000 Message-Id: <20191113095811.14815-1-git@andred.net> X-Mailer: git-send-email 2.23.0.rc1 In-Reply-To: <20191110220510.10077-1-git@andred.net> References: <20191110220510.10077-1-git@andred.net> MIME-Version: 1.0 Subject: [meta-oe][PATCH] nodejs: ensure to use correct compiler & flags always X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Nov 2019 09:58:14 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NodeJS comes with an embedded, patched, version of gyp. Normally, gyp supports compiling for the build machine, e.g. native tools that need to be compiled to run during the build, and for the host, using different variables, e.g. CC and CC.host, etc. Most of this has been patched out in the NodeJS version of gyp, and essentially it only supports compiling using one compiler - ${CC}. This modification excludes LDFLAGS for native tools, and those still evaluate LDFLAGS.host (only). While this modified behaviour is OK for the OE use-case of building native and target tools separately, it means that this recipe can not work as-is with standard gyp, and wrong LDFLAGS are being used for some of the tools compiled (torque) in either case. By setting the make variables that gyp-generated makefiles inspect, we support use of unpatched gyp, and we ensure that all tools are compiled with correct LDFLAGS in either case. This now also allows us to drop the patch that had been applied to work-around this problem. Signed-off-by: André Draszik --- v2: _append not needed for EXTRA_OEMAKE --- .../nodejs/0006-Use-target-ldflags.patch | 24 ------------------- .../recipes-devtools/nodejs/nodejs_10.17.0.bb | 13 +++++++++- 2 files changed, 12 insertions(+), 25 deletions(-) delete mode 100644 meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch diff --git a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch b/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch deleted file mode 100644 index f6569cd57..000000000 --- a/meta-oe/recipes-devtools/nodejs/nodejs/0006-Use-target-ldflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -The target LDFLAGS have been ignored. Tools like torque -have been loaded from system libraries, even if a native -one was the target. -|$ ldd torque -| libz.so.1 => /lib/x86_64-linux-gnu/libz.so.1 -| libcrypto.so.1.1 => /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 -| libssl.so.1.1 => /usr/lib/x86_64-linux-gnu/libssl.so.1.1 -| libicui18n.so.63 => not found -| libicuuc.so.63 => not found -... - -Signed-off-by: Andrej Valek - -diff -Naur node-v10.15.1/deps/v8/gypfiles/toolchain.gypi node-v10.15.1/deps/v8/gypfiles/toolchain.gypi ---- node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:01:39.000000000 +0100 -+++ node-v10.15.1/deps/v8/gypfiles/toolchain.gypi 2019-03-18 15:04:08.628361308 +0100 -@@ -1106,6 +1106,7 @@ - 'cflags': [ '-fno-strict-aliasing' ], - }], - ], # conditions -+ 'ldflags+': [ '$(LDFLAGS)' ], - }], - ['OS=="solaris"', { - 'defines': [ '__C99FEATURES__=1' ], # isinf() etc. diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index 4013c6931..9af0d998c 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -19,7 +19,6 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0001-Disable-running-gyp-files-for-bundled-deps.patch \ file://0004-Make-compatibility-with-gcc-4.8.patch \ file://0005-Link-atomic-library.patch \ - file://0006-Use-target-ldflags.patch \ " SRC_URI_append_class-target = " \ file://0002-Using-native-torque.patch \ @@ -58,6 +57,18 @@ PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" +# We don't want to cross-compile during target compile, +# and we need to use the right flags during host compile, +# too. +EXTRA_OEMAKE = "\ + CC.host='${CC}' \ + CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ + CXX.host='${CXX}' \ + CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ + LDFLAGS.host='${LDFLAGS}' \ + AR.host='${AR}' \ +" + # Node is way too cool to use proper autotools, so we install two wrappers to forcefully inject proper arch cflags to workaround gypi do_configure () { rm -rf ${S}/deps/openssl -- 2.23.0.rc1