pkgsrc-WIP-changes archive

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

semgrep-core: Update to 0.106.0



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Mon Jul 25 14:41:34 2022 +0200
Changeset:	f85929dcd56f4f63ec79af8019017bcb003aaf30

Modified Files:
	semgrep-core/Makefile
Added Files:
	semgrep-core/distinfo
	semgrep-core/patches/patch-semgrep-core_src_core_ast_dune

Log Message:
semgrep-core: Update to 0.106.0

Changes:
Unfortunately really too much to mention, please give a look to upstream
changelog on:

 <https://github.com/returntocorp/semgrep/blob/develop/CHANGELOG.md>

At least in pkgsrc... finally should builds again with current ocaml.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f85929dcd56f4f63ec79af8019017bcb003aaf30

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 semgrep-core/Makefile                              | 25 +++++++++++++---------
 semgrep-core/distinfo                              |  3 +++
 .../patches/patch-semgrep-core_src_core_ast_dune   | 16 ++++++++++++++
 3 files changed, 34 insertions(+), 10 deletions(-)

diffs:
diff --git a/semgrep-core/Makefile b/semgrep-core/Makefile
index eb861a4d03..a058f33a71 100644
--- a/semgrep-core/Makefile
+++ b/semgrep-core/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	semgrep-core-0.60.0
+DISTNAME=	semgrep-core-0.106.0
 PKGREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=returntocorp/}
@@ -27,28 +27,33 @@ MAKE_ENV+=	HOMEBREW_SYSTEM=fake
 MAKE_ENV+=	OPAMROOT=${WRKSRC}/opam
 MAKE_ENV+=	OPAMYES=1
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+PYTHON_FOR_BUILD_ONLY=		tool
+
+TOOL_DEPENDS+=			${PYPKGPREFIX}-jinja2-[0-9]*:../../textproc/py-jinja2
+
 INSTALLATION_DIRS=	bin
 
 do-build:
 	${RUN} cd ${WRKSRC} && \
-	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam init --no-setup --disable-sandboxing && \
+	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam init --no-setup --unlock-base --disable-sandboxing && \
 	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam update -y && \
-	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam install -y --deps-only ./semgrep-core/src/pfff && \
-	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam install -y --deps-only ./semgrep-core/src/ocaml-tree-sitter-core && \
-	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam install -y --deps-only ./semgrep-core
+	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam install -y --unlock-base --deps-only ./semgrep-core/src/pfff && \
+	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam install -y --unlock-base --deps-only ./semgrep-core/src/ocaml-tree-sitter-core && \
+	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam install -y --unlock-base --deps-only ./semgrep-core
 	${RUN} cd ${WRKSRC}/semgrep-core && \
-	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam exec -- make all && \
-	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam exec -- make install
+	    ${_ULIMIT_CMD} ${PKGSRC_SETENV} ${MAKE_ENV} opam exec -- dune build
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/semgrep/semgrep/bin/semgrep-core ${DESTDIR}${PREFIX}/bin/semgrep-core
-	${INSTALL_PROGRAM} ${WRKSRC}/semgrep/semgrep/bin/spacegrep ${DESTDIR}${PREFIX}/bin/spacegrep
+	${INSTALL_PROGRAM} ${WRKSRC}/semgrep-core/_build/install/default/bin/semgrep-core ${DESTDIR}${PREFIX}/bin/semgrep-core
+	${INSTALL_PROGRAM} ${WRKSRC}/semgrep-core/_build/install/default/bin/spacegrep ${DESTDIR}${PREFIX}/bin/spacegrep
 
 .include "../../devel/pcre/buildlink3.mk"
+.include "../../lang/python/pyversion.mk"
 BUILDLINK_DEPMETHOD.ocaml=	build
 .include "../../lang/ocaml/buildlink3.mk"
 BUILDLINK_DEPMETHOD.ocaml-opam=	build
 .include "../../misc/ocaml-opam/buildlink3.mk"
-.include "../../wip/tree-sitter/buildlink3.mk"
+.include "../../textproc/tree-sitter/buildlink3.mk"
 .include "../../wip/mk/git-package.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/semgrep-core/distinfo b/semgrep-core/distinfo
new file mode 100644
index 0000000000..f28cefaa07
--- /dev/null
+++ b/semgrep-core/distinfo
@@ -0,0 +1,3 @@
+$NetBSD$
+
+SHA1 (patch-semgrep-core_src_core_ast_dune) = 4cc60a92ca51c121ad40a19622f2b91559a5fcae
diff --git a/semgrep-core/patches/patch-semgrep-core_src_core_ast_dune b/semgrep-core/patches/patch-semgrep-core_src_core_ast_dune
new file mode 100644
index 0000000000..f5bc66eec9
--- /dev/null
+++ b/semgrep-core/patches/patch-semgrep-core_src_core_ast_dune
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Avoid pipenv dependency.
+
+--- semgrep-core/src/core/ast/dune.orig	2022-07-25 09:57:31.003633884 +0000
++++ semgrep-core/src/core/ast/dune
+@@ -48,8 +48,7 @@
+   (action
+     (no-infer
+       (progn
+-        (run pipenv install)
+-        (run pipenv run python3 gen_lang.py)
++        (run python3 gen_lang.py)
+       )
+     )
+   )


Home | Main Index | Thread Index | Old Index