Date: Wed, 20 Jun 2018 08:53:11 +0000 (UTC) From: "Carlos J. Puga Medina" <cpm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472855 - in head/www/iridium: . files Message-ID: <201806200853.w5K8rBVa093402@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cpm Date: Wed Jun 20 08:53:10 2018 New Revision: 472855 URL: https://svnweb.freebsd.org/changeset/ports/472855 Log: - Add patch to build iridium with native LLVM 6.0 on FreeBSD >= 1101513 - Disable use_gold flag. If lld is enabled, iridium uses the gold linker instead of lld or bfd. We do not want this to happen - Drop FreeBSD 10.3 support - Bump PORTREVISION Added: head/www/iridium/files/extra-patch-llvm-base (contents, props changed) head/www/iridium/files/extra-patch-llvm-port (contents, props changed) Deleted: head/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni Modified: head/www/iridium/Makefile Modified: head/www/iridium/Makefile ============================================================================== --- head/www/iridium/Makefile Wed Jun 20 08:48:19 2018 (r472854) +++ head/www/iridium/Makefile Wed Jun 20 08:53:10 2018 (r472855) @@ -3,7 +3,7 @@ PORTNAME= iridium PORTVERSION= 58.0 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= www MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -16,7 +16,6 @@ LICENSE= BSD3CLAUSE LGPL21 MPL11 LICENSE_COMB= multi BUILD_DEPENDS= gperf:devel/gperf \ - clang60:devel/llvm60 \ yasm:devel/yasm \ ffmpeg>=3.2.2,1:multimedia/ffmpeg \ bash:shells/bash \ @@ -71,8 +70,6 @@ ALL_TARGET= chrome INSTALLS_ICONS= yes BINARY_ALIAS= python=${PYTHON_CMD} -CC= clang60 -CXX= clang++60 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang # Run "./out/${BUILDTYPE}/gn args out/${BUILDTYPE} --list" for all variables. @@ -158,15 +155,20 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false .include <bsd.port.options.mk> +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1101513 +BUILD_DEPENDS+= clang60:devel/llvm60 +CC= clang60 +CXX= clang++60 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-port +.else +BUILD_DEPENDS+= ${LOCALBASE}/bin/ar:devel/binutils +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-llvm-base +.endif + # TODO: -isystem, would be just as ugly as this approach, but more reliably # build would fail without C_INCLUDE_PATH/CPLUS_INCLUDE_PATH env var set. MAKE_ENV+= C_INCLUDE_PATH=${LOCALBASE}/include \ CPLUS_INCLUDE_PATH=${LOCALBASE}/include - -# Work around base r261801 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100508 -GN_ARGS+= extra_cxxflags="-D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1" -.endif pre-everything:: @${ECHO_MSG} Added: head/www/iridium/files/extra-patch-llvm-base ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/extra-patch-llvm-base Wed Jun 20 08:53:10 2018 (r472855) @@ -0,0 +1,53 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2017-04-19 21:06:28.000000000 +0200 ++++ build/toolchain/gcc_toolchain.gni 2018-06-19 17:35:48.967441000 +0200 +@@ -12,6 +12,11 @@ + import("//build/toolchain/goma.gni") + import("//build/toolchain/toolchain.gni") + ++declare_args() { ++ extra_cxxflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -483,10 +488,23 @@ + } + + gcc_toolchain(target_name) { +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- cc = "$prefix/clang" +- cxx = "$prefix/clang++" +- ld = cxx ++ if (is_bsd) { ++ prefix = "/usr/local/bin" ++ cc = "cc" ++ cxx = "c++" ++ ld = cxx ++ readelf = "readelf" ++ ar = "${prefix}/ar" ++ nm = "${toolprefix}nm" ++ } else { ++ prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ cc = "$prefix/clang" ++ cxx = "$prefix/clang++" ++ ld = cxx ++ readelf = "${toolprefix}readelf" ++ ar = "${toolprefix}ar" ++ nm = "${toolprefix}nm" ++ } + + if (use_clang_static_analyzer) { + # Static analysis isn't supported under GOMA. See crbug.com/687245 +@@ -506,10 +524,6 @@ + rebase_path("//third_party/scan-build/src/libexec/c++-analyzer", + root_build_dir) + } +- +- readelf = "${toolprefix}readelf" +- ar = "${toolprefix}ar" +- nm = "${toolprefix}nm" + + forward_variables_from(invoker, [ "strip" ]) + Added: head/www/iridium/files/extra-patch-llvm-port ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/iridium/files/extra-patch-llvm-port Wed Jun 20 08:53:10 2018 (r472855) @@ -0,0 +1,52 @@ +--- build/toolchain/gcc_toolchain.gni.orig 2017-04-19 19:06:28 UTC ++++ build/toolchain/gcc_toolchain.gni +@@ -12,6 +12,11 @@ import("//build/toolchain/clang_static_a + import("//build/toolchain/goma.gni") + import("//build/toolchain/toolchain.gni") + ++declare_args() { ++ extra_cxxflags = "" ++ extra_ldflags = "" ++} ++ + # This template defines a toolchain for something that works like gcc + # (including clang). + # +@@ -483,10 +488,22 @@ template("clang_toolchain") { + } + + gcc_toolchain(target_name) { +- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- cc = "$prefix/clang" +- cxx = "$prefix/clang++" +- ld = cxx ++ if (is_bsd) { ++ cc = "${toolprefix}clang60" ++ cxx = "${toolprefix}clang++60" ++ ld = cxx ++ readelf = "readelf" ++ ar = "${toolprefix}llvm-ar60" ++ nm = "${toolprefix}llvm-nm60" ++ } else { ++ prefix = rebase_path("$clang_base_path/bin", root_build_dir) ++ cc = "$prefix/clang" ++ cxx = "$prefix/clang++" ++ ld = cxx ++ readelf = "${toolprefix}readelf" ++ ar = "${toolprefix}ar" ++ nm = "${toolprefix}nm" ++ } + + if (use_clang_static_analyzer) { + # Static analysis isn't supported under GOMA. See crbug.com/687245 +@@ -507,10 +524,6 @@ template("clang_toolchain") { + root_build_dir) + } + +- readelf = "${toolprefix}readelf" +- ar = "${toolprefix}ar" +- nm = "${toolprefix}nm" +- + forward_variables_from(invoker, [ "strip" ]) + + toolchain_args = {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806200853.w5K8rBVa093402>