pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/cliqz cliqz: Fixed build failures.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2e9e72e35d8
branches:  trunk
changeset: 396126:b2e9e72e35d8
user:      fox <fox%pkgsrc.org@localhost>
date:      Wed May 22 10:53:12 2019 +0000

description:
cliqz: Fixed build failures.

1. Added a missing build dependency, devel/yasm.

2. Fixed build failures when compiling with rust>=1.33 by disabling the
--enable-rust-simd flag for now. (borrowed from ryoon@'s fix from
www/firefox)

3. Bumped the rust dependency minimum version to 1.31.

4. Bump PKGREVISION

diffstat:

 www/cliqz/Makefile          |  9 ++++++---
 www/cliqz/mozilla-common.mk |  6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diffs (52 lines):

diff -r e27afe0a1e0d -r b2e9e72e35d8 www/cliqz/Makefile
--- a/www/cliqz/Makefile        Wed May 22 09:53:10 2019 +0000
+++ b/www/cliqz/Makefile        Wed May 22 10:53:12 2019 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2019/05/13 11:59:06 fox Exp $
+# $NetBSD: Makefile,v 1.8 2019/05/22 10:53:12 fox Exp $
 
 DISTNAME=      cliqz-1.26.5
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=cliqz-oss/}
 GITHUB_PROJECT=        browser-f
@@ -45,7 +46,9 @@
 TOOL_DEPENDS+=                 cbindgen-[0-9]*:../../devel/cbindgen
 TOOL_DEPENDS+=                 nodejs-[0-9]*:../../lang/nodejs
 
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
+BUILD_DEPENDS+=                        yasm>=1.1:../../devel/yasm
+
+WRKSRC=                        ${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
 
 CLIQZ_ICON=            cliqz.png
 CLIQZ_ICON_SRC=                ${WRKSRC}/mozilla-release/browser/branding/cliqz/default48.png
@@ -120,7 +123,7 @@
 BUILDLINK_API_DEPENDS.clang+=  clang>=6.0.1nb1
 .include "../../lang/clang/buildlink3.mk"
 BUILDLINK_DEPMETHOD.rust=      build
-BUILDLINK_API_DEPENDS.rust+=   rust>=1.24.0
+BUILDLINK_API_DEPENDS.rust+=   rust>=1.31.0
 .include "../../lang/rust/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r e27afe0a1e0d -r b2e9e72e35d8 www/cliqz/mozilla-common.mk
--- a/www/cliqz/mozilla-common.mk       Wed May 22 09:53:10 2019 +0000
+++ b/www/cliqz/mozilla-common.mk       Wed May 22 10:53:12 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.1 2019/04/19 14:02:03 fox Exp $
+# $NetBSD: mozilla-common.mk,v 1.2 2019/05/22 10:53:12 fox Exp $
 #
 # Common Makefile fragment for mozilla packages based on gecko 2.0.
 # derived from www/firefox
@@ -64,7 +64,9 @@
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-default-toolkit=cairo-gtk3"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-system-pixman"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-webrender=build"
-MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-rust-simd"
+# Disable Rust SIMD option to fix build with lang/rust-1.33.0
+# This should be enabled later again.
+#MOZ_CONFIGURE_ARGS+=  "ac_add_options --enable-rust-simd"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-system-ffi"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-chrome-format=flat"
 MOZ_CONFIGURE_ARGS+=   "ac_add_options --enable-gconf"



Home | Main Index | Thread Index | Old Index