Skip to content

Commit

Permalink
dev-vcs/git: drop USE=pcre-jit from 9999 too
Browse files Browse the repository at this point in the history
9999 (-r0) tracks stable which is 2.31.x, so that
lacks libpcre1 support too.

Signed-off-by: Sam James <[email protected]>
Signed-off-by: Lars Wendler <[email protected]>
  • Loading branch information
thesamesam authored and Lars Wendler committed Mar 18, 2021
1 parent bd36e93 commit c1f1209
Showing 1 changed file with 4 additions and 16 deletions.
20 changes: 4 additions & 16 deletions dev-vcs/git/git-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,15 @@ 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="
gnome-keyring? ( app-crypt/libsecret )
!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 )
perl? ( dev-lang/perl:=[-build(-)] )
tk? ( dev-lang/tk:0= )
curl? (
Expand Down Expand Up @@ -132,7 +129,6 @@ REQUIRED_USE="
cvs? ( perl )
mediawiki? ( perl )
mediawiki-experimental? ( mediawiki )
pcre-jit? ( pcre )
perforce? ( ${PYTHON_REQUIRED_USE} )
subversion? ( perl )
webdav? ( curl )
Expand Down Expand Up @@ -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+=(
Expand Down

0 comments on commit c1f1209

Please sign in to comment.