diff --git a/conda/migrate.py b/conda/migrate.py index 6b30d0f6cebecc362d503ed17878c7bc473198ba..8124f0fccb499955f0bd4955365170a369108bc7 100755 --- a/conda/migrate.py +++ b/conda/migrate.py @@ -12,7 +12,45 @@ from conda_build.conda_interface import PY3 import os RUN_EXPORTS = [ + ' - bzip2\n', + ' - dbus\n', + ' - expat\n', + ' - ffmpeg\n', + ' - fontconfig\n', + ' - freetype\n', + ' - glib\n', + ' - gmp\n', + ' - gst-plugins-base\n', + ' - gstreamer\n', + ' - hdf5\n', + ' - icu\n', + ' - jpeg\n', + ' - kaldi\n', ' - libblitz\n', + ' - libffi\n', + ' - libmatio\n', + ' - libogg\n', + ' - libopus\n', + ' - libpng\n', + ' - libsvm\n', + ' - libtiff\n', + ' - libvpx\n', + ' - libxcb\n', + ' - libxml2\n', + ' - menpo\n', + ' - mkl-devel\n', + ' - ncurses\n', + ' - openfst\n', + ' - openssl\n', + ' - readline\n', + ' - speex\n', + ' - speexdsp\n', + ' - sqlite\n', + ' - tk\n', + ' - vlfeat\n', + ' - xz\n', + ' - yaml\n', + ' - zlib\n', ] BUILD_ONLY_DEPS = [ @@ -107,7 +145,7 @@ def migrate(template_recipe_path, old_recipe_path, build_variant_path, i1, i2, build_text = extract_section( requirements_text, 'build:\n', 'host:\n') i1, i2, host_text = extract_section(requirements_text, 'host:\n', 'run:\n') - already_build = [ + already_host = [ '- python\n', '- setuptools\n', '- python {{ python }}\n', @@ -116,7 +154,7 @@ def migrate(template_recipe_path, old_recipe_path, build_variant_path, "- {{ compiler('c') }}\n", "- {{ compiler('cxx') }}\n", ] - for line in already_build: + for line in already_host: host_text = host_text.replace(line, '') host_text = host_text.strip() if host_text: @@ -135,7 +173,7 @@ def migrate(template_recipe_path, old_recipe_path, build_variant_path, final_recipe = final_recipe.replace(' <BUILD_DEPS>\n', build_text) run_text = requirements_text[i2 + 5:] - for line in already_build[:2] + RUN_EXPORTS: + for line in already_host[:2] + RUN_EXPORTS: run_text = run_text.replace(line, '') run_text = run_text.strip() run_text = ' ' + run_text + '\n' if run_text else run_text