Attachment 204848 Details for Bug 238353 – v1 (has commit message)

[patch] v1 (has commit message)

bug238353.diff (text/plain), 3.20 KB, created by Jan Beich on 2019-06-05 22:19:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2019-06-05 22:19:32 UTC

Size: 3.20 KB

patch

obsolete

>From 9dcd593f6e2f4b5a4090f578f7529d2a9ff59059 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 5 Jun 2019 20:26:32 +0000
>Subject: [PATCH] devel/gn: modernize build
>
>- Unbreak with GCC
>- Unbreak on DragonFly
>- Allow Python 3.x
>- Allow debug builds
>- Convert to HAS_CONFIGURE
>- Convert to do-build from USES=ninja
>- Drop default build dependency in do-test
>- Drop unnecessary glob in CONFLICTS_INSTALL
>
>PR:		238353
>Approved by:	Oleh Hushchenkov (maintainer)
>---
> devel/gn/Makefile                      | 29 +++++++++++++-------------
> devel/gn/files/patch-build_gen.py      |  9 ++++++++
> devel/gn/files/patch-util_exe__path.cc | 10 +++++++++
> 3 files changed, 34 insertions(+), 14 deletions(-)
> create mode 100644 devel/gn/files/patch-util_exe__path.cc
>
>diff --git a/devel/gn/Makefile b/devel/gn/Makefile
>index abccb7610a19..f5ce4432ad7e 100644
>--- a/devel/gn/Makefile
>+++ b/devel/gn/Makefile
>@@ -3,6 +3,7 @@
> PORTNAME=	gn
> DISTVERSIONPREFIX=	v
> DISTVERSION=	1592
>+PORTREVISION=	1
> CATEGORIES=	devel
> 
> MAINTAINER=	o.hushchenkov@gmail.com
>@@ -11,25 +12,25 @@ COMMENT=	Gn meta build framework - standalone version
> LICENSE=	BSD3CLAUSE
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>-USES=		compiler:c++14-lang ninja python:2.7,build
>+CONFLICTS_INSTALL=	chromimum-gn
> 
>+USES=		alias compiler:c++14-lang ninja python:build shebangfix
> USE_GITHUB=	yes
> GH_ACCOUNT=	cglogic # mirror
>-
>-CONFLICTS_INSTALL=	chromimum-gn*
>-
>-PLIST_FILES=	bin/gn
>-
>-do-configure:
>-	cd ${WRKSRC} && GN_VERSION=${PORTVERSION} ${PYTHON_CMD} build/gen.py
>-
>-do-build:
>-	cd ${WRKSRC} && ninja -C out
>+SHEBANG_FILES=	${CONFIGURE_SCRIPT}
>+HAS_CONFIGURE=	yes
>+CONFIGURE_OUTSOURCE=	yes
>+CONFIGURE_SCRIPT=	build/gen.py
>+CONFIGURE_WRKSRC=	${WRKSRC}/out # --out-path breaks "make test"
>+CONFIGURE_ENV=	GN_VERSION=${PORTVERSION}
>+CONFIGURE_ARGS=	--platform freebsd ${WITH_DEBUG:D--debug}
>+ALL_TARGET=	# empty
>+PLIST_FILES=	bin/${PORTNAME}
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/out/gn ${STAGEDIR}${PREFIX}/bin
>+	${INSTALL_PROGRAM} ${INSTALL_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
> 
>-do-test: build
>-	cd ${WRKSRC} && ./out/gn_unittests
>+do-test:
>+	${TEST_WRKSRC}/gn_unittests
> 
> .include <bsd.port.mk>
>diff --git a/devel/gn/files/patch-build_gen.py b/devel/gn/files/patch-build_gen.py
>index 58103f773c3a..b43a2129a751 100644
>--- a/devel/gn/files/patch-build_gen.py
>+++ b/devel/gn/files/patch-build_gen.py
>@@ -1,5 +1,14 @@
> --- build/gen.py.orig	2019-05-30 09:42:43 UTC
> +++ build/gen.py
>+@@ -46,7 +46,7 @@ class Platform(object):
>+ 
>+   @staticmethod
>+   def known_platforms():
>+-    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'openbsd']
>++    return ['linux', 'darwin', 'msvc', 'aix', 'fuchsia', 'freebsd', 'openbsd']
>+ 
>+   def platform(self):
>+     return self._platform
> @@ -117,24 +117,15 @@ def main(argv):
>  
>  
>diff --git a/devel/gn/files/patch-util_exe__path.cc b/devel/gn/files/patch-util_exe__path.cc
>new file mode 100644
>index 000000000000..c76b9874a4b1
>--- /dev/null
>+++ b/devel/gn/files/patch-util_exe__path.cc
>@@ -0,0 +1,10 @@
>+--- util/exe_path.cc.orig	2019-05-30 00:15:11 UTC
>++++ util/exe_path.cc
>+@@ -16,6 +16,7 @@
>+ #elif defined(OS_FREEBSD)
>+ #include <sys/sysctl.h>
>+ #include <sys/types.h>
>++#include <limits.h> // PATH_MAX
>+ #endif
>+ 
>+ #if defined(OS_MACOSX)

Flags:

o.hushchenkov: maintainer-approval+

Actions: View | Diff

Attachments on bug 238353: 204848 | 204849