diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2021-03-16 14:18:06 +0100 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-03-16 14:19:43 +0100 |
| commit | eea03066a24c86bb30037563d901a609c3060cfc (patch) | |
| tree | 155992c4b9287c5784e125b1e367be0e93939921 /dev-vcs/git/git-9999-r2.ebuild | |
| parent | dev-libs/libmcrypt: Fixed build with >=sys-devel/autoconf-2.70 (diff) | |
| download | gentoo-eea03066a24c86bb30037563d901a609c3060cfc.tar.gz gentoo-eea03066a24c86bb30037563d901a609c3060cfc.tar.bz2 gentoo-eea03066a24c86bb30037563d901a609c3060cfc.zip | |
dev-vcs/git: Removed pcre-jit USE flag
because upstream removed support for libpcre-1.
DroppedKeywords: version 2.31.0: alpha, hppa, ia64, riscv, sparc
Closes: https://bugs.gentoo.org/776646
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-vcs/git/git-9999-r2.ebuild')
| -rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index ed601ab85537..fb897e458836 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.ebuild @@ -51,7 +51,7 @@ fi LICENSE="GPL-2" SLOT="0" -IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" +IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre perforce +perl +ppcsha1 subversion tk +threads +webdav xinetd cvs test" # Common to both DEPEND and RDEPEND DEPEND=" @@ -59,10 +59,7 @@ DEPEND=" !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib - pcre? ( - pcre-jit? ( dev-libs/libpcre2[jit(+)] ) - !pcre-jit? ( dev-libs/libpcre ) - ) + pcre? ( dev-libs/libpcre2[jit(+)] ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( @@ -132,7 +129,6 @@ REQUIRED_USE=" cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) - pcre-jit? ( pcre ) perforce? ( ${PYTHON_REQUIRED_USE} ) subversion? ( perl ) webdav? ( curl ) @@ -206,16 +202,8 @@ exportmakeopts() { sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile || die if use pcre; then - if use pcre-jit; then - myopts+=( USE_LIBPCRE2=YesPlease ) - extlibs+=( -lpcre2-8 ) - else - myopts+=( - USE_LIBPCRE1=YesPlease - NO_LIBPCRE1_JIT=YesPlease - ) - extlibs+=( -lpcre ) - fi + myopts+=( USE_LIBPCRE2=YesPlease ) + extlibs+=( -lpcre2-8 ) fi if [[ ${CHOST} == *-solaris* ]]; then myopts+=( |