# HG changeset patch # User ymh # Date 1580123856 -3600 # Node ID 717966c8d4b874fc998e1fad931af61caa4f3f52 # Parent 66d4cc9cef7e3d4b13504b41fe53e9661de0cc55 Use openjdk 8 for lucene diff -r 66d4cc9cef7e -r 717966c8d4b8 virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Sat Jan 25 03:14:45 2020 +0100 +++ b/virtualenv/res/lib/lib_create_env.py Mon Jan 27 12:17:36 2020 +0100 @@ -153,7 +153,7 @@ cwd=jcc_src_path, filter_stdout=filter_python_develop, show_stdout=True, - extra_env={'JCC_JDK' : '/usr/lib/jvm/java-11-openjdk-i386/'}) + extra_env={'JCC_JDK' : '/usr/lib/jvm/java-8-openjdk-i386/'}) #install pylucene logger.notify("Install pylucene") @@ -194,14 +194,14 @@ cwd=os.path.abspath(pylucene_src_path), filter_stdout=filter_python_develop, show_stdout=True, - extra_env={'JCC_JDK' : '/usr/lib/jvm/java-11-openjdk-i386/'}) + extra_env={'JCC_JDK' : '/usr/lib/jvm/java-8-openjdk-i386/'}) logger.notify("pylucene make install") call_subprocess(['make', 'install'], cwd=os.path.abspath(pylucene_src_path), filter_stdout=filter_python_develop, show_stdout=True, - extra_env={'JCC_JDK' : '/usr/lib/jvm/java-11-openjdk-i386/'}) + extra_env={'JCC_JDK' : '/usr/lib/jvm/java-8-openjdk-i386/'}) def install_psycopg2(option_str, extra_env, res_source_key, home_dir, lib_dir, tmp_dir, src_dir, res_env, logger, call_subprocess, filter_python_develop): diff -r 66d4cc9cef7e -r 717966c8d4b8 virtualenv/web/res/res_create_env.py --- a/virtualenv/web/res/res_create_env.py Sat Jan 25 03:14:45 2020 +0100 +++ b/virtualenv/web/res/res_create_env.py Mon Jan 27 12:17:36 2020 +0100 @@ -47,7 +47,7 @@ ]) else: INSTALLS.extend([ - ('LXML', 'easy_install', None, None), + ('LXML', 'pip', None, None), ])