From owner-svn-ports-all@freebsd.org Tue Jun 9 20:45:13 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 04AAD33C9A9; Tue, 9 Jun 2020 20:45:13 +0000 (UTC) (envelope-from bhughes@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hMZJ6QQnz4dnd; Tue, 9 Jun 2020 20:45:12 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BAD1C1BA3A; Tue, 9 Jun 2020 20:45:12 +0000 (UTC) (envelope-from bhughes@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059KjC1w057702; Tue, 9 Jun 2020 20:45:12 GMT (envelope-from bhughes@FreeBSD.org) Received: (from bhughes@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059KjC7U057700; Tue, 9 Jun 2020 20:45:12 GMT (envelope-from bhughes@FreeBSD.org) Message-Id: <202006092045.059KjC7U057700@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bhughes set sender to bhughes@FreeBSD.org using -f From: "Bradley T. Hughes" Date: Tue, 9 Jun 2020 20:45:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538343 - in head/www/node10: . files X-SVN-Group: ports-head X-SVN-Commit-Author: bhughes X-SVN-Commit-Paths: in head/www/node10: . files X-SVN-Commit-Revision: 538343 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 20:45:13 -0000 Author: bhughes Date: Tue Jun 9 20:45:11 2020 New Revision: 538343 URL: https://svnweb.freebsd.org/changeset/ports/538343 Log: www/node10: fix build with LLVM 10.x and BUNDLED_SSL Add patch-configure.py to fix the LLVM version detection, which did not work with LLVM 10.x. Add patch-common.gypi to remove the LLVM <4 detection that would add -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1 to CFLAGS; this is no longer needed. Bump PORTREVISION since the installed include/node/common.gypi has changed. PR: 247109 Reported by: Hiroyuki Une Sponsored by: Miles AS Added: head/www/node10/files/patch-common.gypi (contents, props changed) head/www/node10/files/patch-configure.py (contents, props changed) Modified: head/www/node10/Makefile Modified: head/www/node10/Makefile ============================================================================== --- head/www/node10/Makefile Tue Jun 9 20:43:04 2020 (r538342) +++ head/www/node10/Makefile Tue Jun 9 20:45:11 2020 (r538343) @@ -3,7 +3,7 @@ PORTNAME= node PORTVERSION= 10.20.1 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= 10 Added: head/www/node10/files/patch-common.gypi ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node10/files/patch-common.gypi Tue Jun 9 20:45:11 2020 (r538343) @@ -0,0 +1,18 @@ +--- common.gypi.orig 2020-06-08 21:52:35 UTC ++++ common.gypi +@@ -509,15 +509,6 @@ + 'libraries': [ '-lelf' ], + }], + ['OS=="freebsd"', { +- 'conditions': [ +- ['"0" < llvm_version < "4.0"', { +- # Use this flag because on FreeBSD std::pairs copy constructor is non-trivial. +- # Doesn't apply to llvm 4.0 (FreeBSD 11.1) or later. +- # Refs: https://lists.freebsd.org/pipermail/freebsd-toolchain/2016-March/002094.html +- # Refs: https://svnweb.freebsd.org/ports/head/www/node/Makefile?revision=444555&view=markup +- 'cflags': [ '-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1' ], +- }], +- ], + 'ldflags': [ + '-Wl,--export-dynamic', + ], Added: head/www/node10/files/patch-configure.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/node10/files/patch-configure.py Tue Jun 9 20:45:11 2020 (r538343) @@ -0,0 +1,11 @@ +--- configure.py.orig 2020-06-08 21:39:42 UTC ++++ configure.py +@@ -705,7 +705,7 @@ def get_nasm_version(asm): + + def get_llvm_version(cc): + return get_version_helper( +- cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([3-9]\.[0-9]+)") ++ cc, r"(^(?:FreeBSD )?clang version|based on LLVM) ([0-9]+\.[0-9]+)") + + def get_xcode_version(cc): + return get_version_helper(