From nobody Mon Feb 20 22:09:05 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PLGm15902z3sGqZ; Mon, 20 Feb 2023 22:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PLGm14fRJz3qsQ; Mon, 20 Feb 2023 22:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676930945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8tfHXn/JzlgdAIMoB5BIcqyIwIUwueUYGzOzI0Eswo=; b=kLSkOYyAQsKsuSpZi0PVrZV/8yrVBpD3HiDrReQAiAI0iD7GHPrOlFtJjRzRptCwmy5GKi jVKqKrJ7LXMocQKVxHueifKe8RxMLPw/Zi0So9CxM0gvvqstTRhw83kN7OEV7TaxKUh32e 6mDQ05lwVF/G05OiTYtmaOd0hLJkOUI8D9fTjd+uvJss+jYFgB4c4V5lkrDlRMgiHOtjrR 8xFwCn382OnnGKYXAj6jU0SgCg1lKtp9AaccHtFJuTbF1+BqnV1sszSs7Eyrqhs8INjib2 q0WPQ4JEqGgWppjEbiugv1SpaiW5J05WIwIvM3M7q7CIjdVpQUyW/neXLr+gnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676930945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x8tfHXn/JzlgdAIMoB5BIcqyIwIUwueUYGzOzI0Eswo=; b=FzUdTehY4hkEnOz0LTd7QnNMfOXrx+hgqQ6ZY7/viwT9BWso7m4qZAPbsUZD7H8OqJBRVK DWjQHGPoDqvyOVK57VSwGRpJuMpdMzyqHp+fJvCWb8VVME1KrvdY4XJD/FQzcKsKDPyScb ZLm9K9xe6jxlCtcWV+3Duzf0gvSyojYxLiNkdaK7rCvQnW0Gt4T4akio/6doOpR1rrDszH 33dcFj7F2sIE4L3gVe34yZi61jfAjqkUy3mXF8NNwkBzwK86Fi+kxyK4AJmTdKnMKS8Hn4 qVVjaBu83M49ixVERzMFxfr4er9+lcZzwpPgbTFieWr94L+CfDeIVE2q1pqYSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676930945; a=rsa-sha256; cv=none; b=Q3hr9VTefDt1x2u+FVP2inlp4UJpAdiVil5NK0TafAuthDPjHEuoASDuDu6TjxVOag14Jy 8YZNLeinsgOxSQYpeGVpwlZpF619/Grz7D+sS6ZMDB52EE22+O6ZX7Y0tC5qi0mbMj68Qa vk+I9nD2GbNrsuOtfJnaDBb8RNQ2kZnSiQqOYjrUv+h37VylC1Ku0cmpZDJWiaR+v5z2Dk dz4EanfsloggF0Eszm6yC3Ck6XqZl5AcpwtpdNr6k+k6p8QUCC5zQdm43o0qiQUn8gPeTg e8HQ9fVaRW7wNX2mH/YdIdRv5DVEFeJvvoSQ29VdqUurGIaJunmzkbEJMi/AXg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PLGm13j7yzxGX; Mon, 20 Feb 2023 22:09:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31KM95gd054175; Mon, 20 Feb 2023 22:09:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KM95X2054174; Mon, 20 Feb 2023 22:09:05 GMT (envelope-from git) Date: Mon, 20 Feb 2023 22:09:05 GMT Message-Id: <202302202209.31KM95X2054174@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: 982f1ce4b437 - main - www/node16: Use ccache if available List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 982f1ce4b4370b5892147e0e4b420f3ac2224c30 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=982f1ce4b4370b5892147e0e4b420f3ac2224c30 commit 982f1ce4b4370b5892147e0e4b420f3ac2224c30 Author: Juraj Lutter AuthorDate: 2023-02-13 10:44:49 +0000 Commit: Matthias Andree CommitDate: 2023-02-20 22:08:51 +0000 www/node16: Use ccache if available Set CC_host and CXX_host to also use ccache when available. This helps to speed up the build significantly. And while here, also portclippy/portfmt a bit. PR: 269491 --- www/node16/Makefile | 121 ++++++++++++++++++++++++++++------------------------ 1 file changed, 65 insertions(+), 56 deletions(-) diff --git a/www/node16/Makefile b/www/node16/Makefile index fdec6b049e4e..91afb2ec9a65 100644 --- a/www/node16/Makefile +++ b/www/node16/Makefile @@ -12,16 +12,52 @@ WWW= https://nodejs.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_SSL= libressl libressl-devel -BROKEN_SSL_REASON= Node.js ${PORTVERSION:R:R}.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled -ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le +ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le -USES= compiler:c++11-lib gmake python:3.6+,build pkgconfig \ - localbase shebangfix +BUILD_DEPENDS+= brotli>=1.0.9,1:archivers/brotli \ + c-ares>=1.17.2:dns/c-ares \ + libnghttp2>=1.45.1:www/libnghttp2 \ + libuv>=1.42.0:devel/libuv \ + objdump:devel/binutils +LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ + libcares.so:dns/c-ares \ + libnghttp2.so:www/libnghttp2 \ + libuv.so:devel/libuv -OPTIONS_DEFINE= BUNDLED_SSL DOCS NLS DTRACE COREPACK -OPTIONS_DEFAULT= DTRACE COREPACK -OPTIONS_SUB= yes +USES= compiler:c++11-lib gmake localbase pkgconfig python:3.6+,build \ + shebangfix + +BROKEN_SSL= libressl libressl-devel +BROKEN_SSL_REASON= node.js ${PORTVERSION:R:R}.x LTS requires OpenSSL 1.1.x or the BUNDLED_SSL option enabled + +SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py deps/v8/tools/*.py \ + tools/*.py tools/inspector_protocol/*.py + +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ + --shared-brotli \ + --shared-cares \ + --shared-libuv \ + --shared-nghttp2 \ + --shared-zlib \ + --without-npm +CONFIGURE_ENV+= CC_host="${CCACHE_BIN} ${CC}" \ + CFLAGS_host="${CFLAGS}" \ + CXX_host="${CCACHE_BIN} ${CXX}" \ + CXXFLAGS_host="${CXXFLAGS}" \ + LDFLAGS_host="${LDFLAGS}" \ + LINK_host=${CXX} +MAKE_ENV+= CFLAGS.host="${CFLAGS}" \ + CXXFLAGS.host="${CXXFLAGS}" \ + LDFLAGS.host="${LDFLAGS}" + +CONFLICTS_INSTALL= node[0-9][0-9] + +REINPLACE_ARGS= -i '' +PORTSCOUT= limit:^16\. + +OPTIONS_DEFINE= BUNDLED_SSL COREPACK DOCS DTRACE NLS +OPTIONS_DEFAULT= COREPACK DTRACE .if !exists(/usr/sbin/dtrace) OPTIONS_EXCLUDE+= DTRACE @@ -29,62 +65,35 @@ OPTIONS_EXCLUDE+= DTRACE OPTIONS_EXCLUDE_aarch64= DTRACE # dt_modtext:/usr/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c(820): arm not implemented -OPTIONS_EXCLUDE_armv6= DTRACE -OPTIONS_EXCLUDE_armv7= DTRACE +OPTIONS_EXCLUDE_armv6= DTRACE +OPTIONS_EXCLUDE_armv7= DTRACE OPTIONS_EXCLUDE_powerpc64= DTRACE OPTIONS_EXCLUDE_powerpc64le= DTRACE -BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation -BUNDLED_SSL_USES_OFF= ssl -BUNDLED_SSL_CONFIGURE_OFF= --shared-openssl --openssl-use-def-ca-store -BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss - -NLS_CONFIGURE_ON= --with-intl=system-icu -NLS_BUILD_DEPENDS= icu>=69.1:devel/icu -NLS_LIB_DEPENDS= libicui18n.so:devel/icu - -DTRACE_CONFIGURE_ON= --with-dtrace +OPTIONS_SUB= yes +BUNDLED_SSL_DESC= Use node.js's bundled OpenSSL implementation COREPACK_DESC= Build and install corepack package manager -COREPACK_CONFIGURE_OFF= --without-corepack -HAS_CONFIGURE= yes +BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss +BUNDLED_SSL_USES_OFF= ssl +BUNDLED_SSL_CONFIGURE_OFF= --openssl-use-def-ca-store \ + --shared-openssl -CONFLICTS_INSTALL= node[0-9][0-9] +COREPACK_CONFIGURE_OFF= --without-corepack -CONFIGURE_ARGS= --prefix=${PREFIX_RELDEST} \ - --without-npm \ - --shared-brotli \ - --shared-cares \ - --shared-libuv \ - --shared-nghttp2 \ - --shared-zlib +DTRACE_CONFIGURE_ON= --with-dtrace -SHEBANG_FILES= deps/v8/tools/*.py \ - deps/v8/third_party/inspector_protocol/*.py \ - tools/*.py \ - tools/inspector_protocol/*.py +NLS_BUILD_DEPENDS= icu>=69.1:devel/icu +NLS_LIB_DEPENDS= libicui18n.so:devel/icu +NLS_CONFIGURE_ON= --with-intl=system-icu PREFIX_RELDEST= ${PREFIX:S,^${DESTDIR},,} -REINPLACE_ARGS= -i '' -MAKE_ENV+= CC.host=${CC} CFLAGS.host="${CFLAGS}" \ - CXX.host=${CXX} CXXFLAGS.host="${CXXFLAGS}" \ - LINK.host=${CXX} LDFLAGS.host="${LDFLAGS}" - -BUILD_DEPENDS+= brotli>=1.0.9,1:archivers/brotli \ - c-ares>=1.17.2:dns/c-ares \ - libuv>=1.42.0:devel/libuv \ - libnghttp2>=1.45.1:www/libnghttp2 \ - objdump:devel/binutils -LIB_DEPENDS+= libbrotlidec.so:archivers/brotli \ - libcares.so:dns/c-ares \ - libuv.so:devel/libuv \ - libnghttp2.so:www/libnghttp2 .include .if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-common.gypi .endif .if ${ARCH} == armv6 || ${ARCH} == armv7 @@ -92,7 +101,7 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-tools_v8__gypfiles_v8.gyp .endif .if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64 -CONFIGURE_ARGS+=--openssl-no-asm +CONFIGURE_ARGS+= --openssl-no-asm .endif post-patch: @@ -100,12 +109,12 @@ post-patch: ${WRKSRC}/tools/v8_gypfiles/v8.gyp post-configure: - # Post-process Makefile and *.mk files created by node-gyp and remove - # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this - # before all -I../deps/* for bundled code. This can cause build - # breakages if the dependency is installed in ${LOCALBASE}. The - # USES+=localbase # above will ensure that we pick up includes for real - # external dependencies. +# Post-process Makefile and *.mk files created by node-gyp and remove +# all occurrences of -I${LOCALBASE}/include. C*FLAGS include this +# before all -I../deps/* for bundled code. This can cause build +# breakages if the dependency is installed in ${LOCALBASE}. The +# USES+=localbase # above will ensure that we pick up includes for real +# external dependencies. ${FIND} ${WRKSRC}/out -type f -print0 \ | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"