Date: Tue, 9 Jun 2020 20:45:12 +0000 (UTC) From: "Bradley T. Hughes" <bhughes@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538343 - in head/www/node10: . files Message-ID: <202006092045.059KjC7U057700@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <une@edu.hkg.ac.jp> 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(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006092045.059KjC7U057700>