Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 11 May 2020 11:11:26 +0000 (UTC)
From:      Hiroki Tagato <tagattie@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r534907 - in head/devel/electron4: . files
Message-ID:  <202005111111.04BBBQ2k050351@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tagattie
Date: Mon May 11 11:11:26 2020
New Revision: 534907
URL: https://svnweb.freebsd.org/changeset/ports/534907

Log:
  Fix build of native node modules on -CURRENT (clang 10)
  
  Approved by:	ehaupt (mentor)

Added:
  head/devel/electron4/files/patch-third__party_electron__node_common.gypi   (contents, props changed)
Modified:
  head/devel/electron4/Makefile

Modified: head/devel/electron4/Makefile
==============================================================================
--- head/devel/electron4/Makefile	Mon May 11 11:08:48 2020	(r534906)
+++ head/devel/electron4/Makefile	Mon May 11 11:11:26 2020	(r534907)
@@ -3,7 +3,7 @@
 PORTNAME=	electron
 DISTVERSIONPREFIX=	v
 DISTVERSION=	${ELECTRON_VER:S/-beta./.b/}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tagattie/FreeBSD-Electron/releases/download/v4.1.0/:chromium \
 		https://commondatastorage.googleapis.com/chromium-browser-official/:chromium_official \

Added: head/devel/electron4/files/patch-third__party_electron__node_common.gypi
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/electron4/files/patch-third__party_electron__node_common.gypi	Mon May 11 11:11:26 2020	(r534907)
@@ -0,0 +1,18 @@
+--- third_party/electron_node/common.gypi.orig	2020-05-09 08:13:10 UTC
++++ third_party/electron_node/common.gypi
+@@ -507,15 +507,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',
+         ],



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005111111.04BBBQ2k050351>