pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/rust rust: Ensure the bundled http-parser is used.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/73ab548479b9
branches:  trunk
changeset: 315772:73ab548479b9
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Nov 29 14:32:14 2018 +0000

description:
rust: Ensure the bundled http-parser is used.

Trying to mix and match pkgsrc and bundled dependencies resulted in conflicts
between libgit and http-parser, such that cargo was unable to fetch indexes
from crates.io with spurious network error regarding Content-Type headers.

While here add a note about why these dependencies are currently disabled.

Bump PKGREVISION.

diffstat:

 lang/rust/Makefile |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r fe458df95277 -r 73ab548479b9 lang/rust/Makefile
--- a/lang/rust/Makefile        Thu Nov 29 14:18:52 2018 +0000
+++ b/lang/rust/Makefile        Thu Nov 29 14:32:14 2018 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2018/11/27 15:45:23 adam Exp $
+# $NetBSD: Makefile,v 1.67 2018/11/29 14:32:14 jperkin Exp $
 
 DISTNAME=      rustc-1.30.1-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://static.rust-lang.org/dist/
 
@@ -423,14 +424,18 @@
         ${GTAR} -zcf ${PKGNAME_NOREV}-${RUST_ARCH}.tar.gz ${PKGNAME_NOREV}-${RUST_ARCH})
 .endif
 
+# These dependencies currently use the bundled sources as they require
+# development features not yet available in released versions.
+#
+#.include "../../devel/libgit2/buildlink3.mk"
+#.include "../../security/libssh2/buildlink3.mk"
+#.include "../../www/curl/buildlink3.mk"
+#.include "../../www/http-parser/buildlink3.mk"
+
 .include "../../devel/cmake/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
-#.include "../../devel/libgit2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 #.include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/python/tool.mk"
-#.include "../../security/libssh2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-#.include "../../www/curl/buildlink3.mk"
-.include "../../www/http-parser/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index