diff options
author | wiz <wiz@pkgsrc.org> | 2019-11-26 10:22:17 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2019-11-26 10:22:17 +0000 |
commit | c6852e4337cf66979ab74d5f5b678ac4bf1aeb6b (patch) | |
tree | 799440f7950d2d5f4a55d05a553020f679cf5a4e /devel/git-base | |
parent | 7702e1f8c527ee60a5f55cc22db72e98f5aee481 (diff) | |
download | pkgsrc-c6852e4337cf66979ab74d5f5b678ac4bf1aeb6b.tar.gz |
git-base: depend on pcre2-10.34
That version has a different JIT version enabled. Remove PaX mprotect
workaround.
Bump PKGREVISION.
Diffstat (limited to 'devel/git-base')
-rw-r--r-- | devel/git-base/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/devel/git-base/Makefile b/devel/git-base/Makefile index 34a2cf4ab03..0fbac389b6b 100644 --- a/devel/git-base/Makefile +++ b/devel/git-base/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.70 2019/11/20 18:13:52 adam Exp $ +# $NetBSD: Makefile,v 1.71 2019/11/26 10:22:17 wiz Exp $ .include "../../devel/git/Makefile.common" PKGNAME= git-base-${GIT_VERSION} +PKGREVISION= 1 COMMENT= GIT Tree History Storage Tool (base package) CONFLICTS+= scmgit-base-[0-9]* @@ -94,8 +95,6 @@ CONFIGURE_ARGS+= git_cv_ld_dashr=no INSTALL_ENV+= NO_CROSS_DIRECTORY_HARDLINKS=1 INSTALL_ENV+= NO_INSTALL_HARDLINKS=1 -NOT_PAX_MPROTECT_SAFE= bin/git # pcre2 - post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR} ${INSTALL_DATA} ${WRKSRC}/contrib/completion/git-completion.bash \ @@ -107,6 +106,7 @@ post-install: .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +BUILDLINK_API_DEPENDS.pcre2?= pcre2>=10.34 .include "../../devel/pcre2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" |